Skip to content

Commit

Permalink
Merge pull request #311 from IN-CORE/pin-pandas
Browse files Browse the repository at this point in the history
pin pandas < 2
  • Loading branch information
robkooper authored Apr 7, 2023
2 parents 7502488 + feabafe commit 58454e1
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 33 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- matplotlib>=2.1.0
- networkx>=2.2
- numpy>=1.16.6,<2.0a0
- pandas>=0.24.1
- pandas>=0.24.1,<2
- pycodestyle>=2.6.0
- pyomo>=5.6
- pyproj>=1.9.6
Expand Down
2 changes: 1 addition & 1 deletion recipes/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ requirements:
- geopandas>=0.6.1
- matplotlib>=2.1.0
- networkx>=2.2
- pandas>=0.24.1
- pandas>=0.24.1,<2
- pyomo>=5.6
- pyproj>=1.9.6
- rasterio>=1.0.18
Expand Down
2 changes: 1 addition & 1 deletion requirements.min
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ipopt>=3.11
matplotlib>=2.1.0
networkx>=2.2
numpy>=1.16.6,<2.0a0
pandas>=0.24.1
pandas>=0.24.1,<2
pycodestyle>=2.6.0
pyomo>=5.6
pyproj>=1.9.6
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ geopandas>=0.6.1
matplotlib>=2.1.0
networkx>=2.2
numpy>=1.16.6,<2.0a0
pandas>=0.24.1
pandas>=0.24.1,<2
pycodestyle>=2.6.0
pyomo>=5.6
pyproj>=1.9.6
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
'matplotlib>=2.1.0',
'networkx>=2.2',
'numpy>=1.16.6,<2.0a0',
'pandas>=0.24.1',
'pandas>=0.24.1,<2',
'pyomo>=5.6',
'pyproj>=1.9.6',
'rasterio>=1.0.18',
Expand Down
58 changes: 30 additions & 28 deletions versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,49 @@ This file is autogenerated and lists the latest versions of all dependencies. Th

| PIP Package | Conda Package | Required Version | Matched Version (pip) |
|-------------|---------------|------------------|-----------------------|
| fiona | | \>=1.8.4| 1.8.21 |
| geopandas | | \>=0.6.1| 0.11.0 |
| matplotlib | | \>=2.1.0| 3.5.2 |
| networkx | | \>=2.2| 2.8.5 |
| numpy | | \>=1.16.6,\<2.0a0| 1.23.1 |
| pandas | | \>=0.24.1| 1.4.3 |
| pycodestyle | | \>=2.6.0| 2.8.0 |
| pyomo | | \>=5.6| 6.4.1 |
| pyproj | | \>=1.9.6| 3.3.1 |
| pytest | | \>=3.9.0| 7.1.2 |
| fiona | | \>=1.8.4| 1.9.2 |
| geopandas | | \>=0.6.1| 0.12.2 |
| matplotlib | | \>=2.1.0| 3.7.1 |
| networkx | | \>=2.2| 3.1 |
| numpy | | \>=1.16.6,\<2.0a0| 1.24.2 |
| pandas | | \>=0.24.1,\<2| 1.5.3 |
| pycodestyle | | \>=2.6.0| 2.10.0 |
| pyomo | | \>=5.6| 6.5.0 |
| pyproj | | \>=1.9.6| 3.5.0 |
| pytest | | \>=3.9.0| 7.2.2 |
| python-jose | | \>=3.0| 3.3.0 |
| rasterio | | \>=1.0.18| 1.3.0 |
| requests | | \>=2.20.0| 2.28.1 |
| rtree | | \>=0.8.3| 1.0.0 |
| scipy | | \>=1.2.0| 1.8.1 |
| shapely | | \>=1.6.4.post1| 1.8.2 |
| wntr | | \>=0.1.6| 0.4.2 |
| affine | | | 2.3.1 |
| attrs | | | 21.4.0 |
| certifi | | | 2022.6.15 |
| charset-normalizer | | | 2.1.0 |
| rasterio | | \>=1.0.18| 1.3.6 |
| requests | | \>=2.20.0| 2.28.2 |
| rtree | | \>=0.8.3| 1.0.1 |
| scipy | | \>=1.2.0| 1.10.1 |
| shapely | | \>=1.6.4.post1| 2.0.1 |
| wntr | | \>=0.1.6| 1.0.0 |
| affine | | | 2.4.0 |
| attrs | | | 22.2.0 |
| certifi | | | 2022.12.7 |
| charset-normalizer | | | 3.1.0 |
| click | | | 8.1.3 |
| click-plugins | | | 1.1.1 |
| cligj | | | 0.7.2 |
| contourpy | | | 1.0.7 |
| cycler | | | 0.11.0 |
| ecdsa | | | 0.18.0 |
| fonttools | | | 4.34.4 |
| idna | | | 3.3 |
| iniconfig | | | 1.1.1 |
| exceptiongroup | | | 1.1.1 |
| fonttools | | | 4.39.3 |
| idna | | | 3.4 |
| iniconfig | | | 2.0.0 |
| kiwisolver | | | 1.4.4 |
| munch | | | 2.5.0 |
| packaging | | | 21.3 |
| pillow | | | 9.2.0 |
| packaging | | | 23.0 |
| pillow | | | 9.5.0 |
| pluggy | | | 1.0.0 |
| ply | | | 3.11 |
| pyasn1 | | | 0.4.8 |
| pyparsing | | | 3.0.9 |
| python-dateutil | | | 2.8.2 |
| pytz | | | 2022.1 |
| rsa | | | 4.8 |
| pytz | | | 2023.3 |
| rsa | | | 4.9 |
| six | | | 1.16.0 |
| snuggs | | | 1.4.7 |
| tomli | | | 2.0.1 |
| urllib3 | | | 1.26.10 |
| urllib3 | | | 1.26.15 |

0 comments on commit 58454e1

Please sign in to comment.