Skip to content

Commit aee8aa0

Browse files
authored
unpin numpy,pandas and pot versions (#155)
* unpin numpy,pandas and pot versions * Update setup.py * Update test.yaml * Update setup.py * Update setup.py * Update test_runner.yaml * Update runner-requirements.txt
1 parent b0e062b commit aee8aa0

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, ubuntu-20.04, macos-latest, windows-latest]
17-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
17+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1818

1919
steps:
2020
- name: Checkout

.github/workflows/test_runner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, ubuntu-20.04, macos-latest, windows-latest]
17-
python-version: ["3.8", "3.9", "3.10"]
17+
python-version: ["3.9", "3.10"]
1818

1919
steps:
2020
- name: Checkout

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ torchvision>=0.11.0
33

44
lightning-bolts
55
matplotlib
6-
numpy<2.0.0
6+
numpy
77
scipy
88
scikit-learn
99
scprep
1010
scanpy
1111
torchdyn>=1.0.6 # 1.0.4 is broken on pypi
12-
pot<0.9.5
12+
pot
1313
torchdiffeq
1414
absl-py
1515
clean-fid

runner-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ pytest # tests
3838
# --------- pkg reqs -------- #
3939
lightning-bolts
4040
matplotlib
41-
numpy<2.0.0 # Due to pandas incompatibility
41+
numpy
4242
scipy
4343
scikit-learn
4444
scprep
4545
scanpy
4646
timm
4747
torchdyn>=1.0.5 # 1.0.4 is broken on pypi
48-
pot<0.9.5
48+
pot
4949

5050
# --------- notebook reqs -------- #
5151
seaborn>=0.12.2
52-
pandas
52+
pandas>=2.2.2

setup.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@
66

77
install_requires = [
88
"torch>=1.11.0",
9-
"torchvision>=0.11.0",
10-
"lightning-bolts",
119
"matplotlib",
12-
"numpy<2.0.0", # Due to pandas incompatibility
10+
"numpy", # Due to pandas incompatibility
1311
"scipy",
1412
"scikit-learn",
15-
"scprep",
16-
"scanpy",
17-
"torchdyn",
18-
"pot<0.9.5",
13+
"torchdyn>=1.0.6",
14+
"pot",
1915
"torchdiffeq",
2016
"absl-py",
21-
"clean-fid",
17+
"pandas>=2.2.2",
2218
]
2319

2420
version_py = os.path.join(os.path.dirname(__file__), "torchcfm", "version.py")

0 commit comments

Comments
 (0)