Skip to content

Commit 846692d

Browse files
authored
Merge pull request #18 from NCAR/djgagne
Update versions to support numpy 2
2 parents 8677e74 + 61d577f commit 846692d

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/python-package-conda.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ jobs:
1111
run:
1212
shell: bash -l {0}
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: conda-incubator/setup-miniconda@v2
14+
- uses: actions/checkout@v4
15+
- uses: conda-incubator/setup-miniconda@v3
1616
with:
17-
miniconda-version: "latest"
18-
mamba-version: "*"
17+
miniforge-version: latest
1918
channel-priority: true
2019
environment-file: environment.yml
2120
auto-activate-base: false

echo/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1
1+
1.2

environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ channels:
33
- conda-forge
44
- pytorch
55
dependencies:
6-
- python=3.10
6+
- python=3.12
77
- sphinx
88
- pytest
99
- setuptools
10-
- optuna
11-
- numpy<1.23.0
10+
- optuna<4.0
11+
- numpy
1212
- scipy
1313
- matplotlib
1414
- scikit-learn

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ numpy
22
scipy
33
matplotlib
44
pandas
5-
optuna
5+
optuna<4.0
66
setuptools
77
pyyaml
88
scikit-learn
99
xgboost
10-
pyarrow
10+
pyarrow

setup.cfg

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ classifiers =
1616
Programming Language :: Python :: 3.9
1717
Programming Language :: Python :: 3.10
1818
Programming Language :: Python :: 3.11
19+
Programming Language :: Python :: 3.12
1920

2021
url = https://github.com/NCAR/echo-opt
2122

@@ -26,12 +27,12 @@ packages =
2627
echo.src
2728
include_package_data = True
2829
setup_requires = setuptools
29-
python_requires = >=3.7
30+
python_requires = >3.7
3031
install_requires =
31-
numpy<2
32+
numpy
3233
scipy
3334
matplotlib
34-
optuna
35+
optuna<4.0
3536
setuptools
3637
pandas
3738
scikit-learn

0 commit comments

Comments
 (0)