Skip to content

Commit

Permalink
Merge branch '2.1.x' into 2.2.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	environment.yml
  • Loading branch information
j-ittner committed Apr 13, 2023
2 parents ab9c424 + 5fb1189 commit 10ed6e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ stages:
versionSpec: '3.9'
displayName: 'use Python 3.9'
- script: |
python -m pip install isort~=5.10
python -m pip install isort~=5.12
python -m isort --check --diff .
displayName: 'Run isort'
- job:
Expand Down
12 changes: 6 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ dependencies:
- boruta_py ~= 0.3
- gamma-pytools ~= 2.1rc, <3a
- joblib ~= 1.2
- lightgbm ~= 3.3.4
- matplotlib ~= 3.6.3
- lightgbm ~= 3.3
- matplotlib ~= 3.6
- numpy ~= 1.23.5
- pandas ~= 1.5.3
- python ~= 3.9.15
- pandas ~= 1.5
- python ~= 3.9
- scikit-learn ~= 1.2.0
- scipy ~= 1.10.0
- xgboost ~= 1.7.1
- scipy ~= 1.10
- xgboost ~= 1.7
# build/test
- conda-build ~= 3.23.3
- conda-verify ~= 3.1.1
Expand Down

0 comments on commit 10ed6e5

Please # to comment.