Merge pull request #197 from knaaptime/pyproj_pin

pysal · May 31, 2022 · 54c22e3 · 54c22e3
2 parents 5578854 + a70efb2
commit 54c22e3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.ci/37.yml → .ci/310.yml b/.ci/37.yml → .ci/310.yml
@@ -2,7 +2,7 @@ name: test
 channels:
   - conda-forge
 dependencies:
-  - python=3.7
+  - python=3.10
   - deprecation
   - geopandas>=0.9
   - joblib
@@ -22,10 +22,11 @@ dependencies:
   - urbanaccess
   - rvlib
   - numba
+  - pyproj >=3
+
   # testing, etc
   - codecov
   - pytest
   - pytest-mpl
   - pytest-cov
   - twine
-  - jsonschema==3.*
diff --git a/.ci/38.yml b/.ci/38.yml
@@ -22,11 +22,12 @@ dependencies:
   - urbanaccess
   - rvlib
   - numba
+  - pyproj >=3
+
   # testing, etc
   - codecov
   - pytest
   - pytest-mpl
   - pytest-cov
   - twine
-  - jsonschema==3.*
 
diff --git a/.ci/39.yml b/.ci/39.yml
@@ -21,14 +21,16 @@ dependencies:
   - tqdm
   - urbanaccess
   - numba
+  - pyproj >=3
+
   # testing, etc
   - codecov
   - pytest
   - pytest-mpl
   - pytest-cov
   - twine
   - rvlib
-  - jsonschema==3.*
+
   # docs
   - ipywidgets
   - nbsphinx

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -18,7 +18,7 @@
      strategy:
        matrix:
          os: [ubuntu-latest, macos-latest, windows-latest]
-         environment-file: [.ci/37.yml, .ci/38.yml, .ci/39.yml]
+         environment-file: [.ci/38.yml, .ci/39.yml, .ci/310.yml]
          experimental: [false]
          fail-fast: [false]
 

diff --git a/environment.yml b/environment.yml
@@ -22,4 +22,5 @@ dependencies:
   - tqdm
   - urbanaccess
   - rvlib
-  - numba
+  - numba
+  - pyproj >=3
diff --git a/requirements.txt b/requirements.txt
@@ -15,3 +15,4 @@ seaborn
 tqdm
 rvlib>=0.0.5
 numba
+pyproj>=3
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,5 @@ dependencies: @@
       - tqdm
       - urbanaccess
       - rvlib
-      - numba
+      - numba
+      - pyproj >=3