Merge pull request #461 from jGaboardi/req_versions

Updating pinned requirements versions
pysal · Apr 3, 2020 · ab1b097 · ab1b097
2 parents 5bc502f + b0924e8
commit ab1b097
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 14 deletions.
diff --git a/ci/36-GIT-PLUS.yaml b/ci/36-GIT-PLUS.yaml
@@ -6,14 +6,16 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
   # required
   - pip
   - pip:

diff --git a/ci/36-GIT.yaml b/ci/36-GIT.yaml
@@ -6,7 +6,9 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/ci/36-PYPI-PLUS.yaml b/ci/36-PYPI-PLUS.yaml
@@ -7,11 +7,13 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
diff --git a/ci/36-PYPI.yaml b/ci/36-PYPI.yaml
@@ -7,7 +7,9 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/ci/37-GIT-PLUS.yaml b/ci/37-GIT-PLUS.yaml
@@ -6,14 +6,16 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
   # required
   - pip
   - pip:

diff --git a/ci/37-GIT.yaml b/ci/37-GIT.yaml
@@ -6,7 +6,9 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/ci/37-PYPI-PLUS.yaml b/ci/37-PYPI-PLUS.yaml
@@ -7,11 +7,13 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
diff --git a/ci/37-PYPI.yaml b/ci/37-PYPI.yaml
@@ -7,7 +7,9 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/ci/38-GIT-PLUS.yaml b/ci/38-GIT-PLUS.yaml
@@ -6,14 +6,16 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
   # required
   - pip
   - pip:

diff --git a/ci/38-GIT.yaml b/ci/38-GIT.yaml
@@ -6,7 +6,9 @@ dependencies:
   # required
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/ci/38-PYPI-PLUS.yaml b/ci/38-PYPI-PLUS.yaml
@@ -7,11 +7,13 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest
   - pytest-cov
   - codecov
   # optional
-  - geopandas
+  - geopandas>=0.7.0
diff --git a/ci/38-PYPI.yaml b/ci/38-PYPI.yaml
@@ -7,7 +7,9 @@ dependencies:
   - libpysal
   - esda
   - numpy
+  - pandas>=1.0
   - rtree
+  - scipy>=1.0
   - watermark
   # testing
   - pytest

diff --git a/environment.yml b/environment.yml
@@ -3,15 +3,18 @@ channels:
   - conda-forge
 dependencies:
   - python=3.7
-  - geopandas
   - descartes
-  - rtree
-  - libspatialindex
-  - pulp
   - esda
+  - geopandas>=0.7.0
+  - libspatialindex
   - matplotlib
-  - watermark
+  - numpy
+  - pandas>=1.0
+  - pulp
+  - rtree
+  - scipy>=1.0
   - seaborn
+  - watermark
   - pip
   - pip:
     - mip

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 esda
 numpy>=1.3
-pandas
+pandas>=1.0
 rtree
-scipy>=0.11
+scipy>=1.0
diff --git a/requirements_plus.txt b/requirements_plus.txt
@@ -1 +1 @@
-geopandas>=0.3.0
+geopandas>=0.7.0