From 5ee2419d65352db31c55ec003abc14fbd8b47c2b Mon Sep 17 00:00:00 2001 From: Caleb Robinson Date: Fri, 3 Sep 2021 19:15:49 +0000 Subject: [PATCH] pyproj 3.0 to keep 3.6 support everywhere --- environment.yml | 2 +- requirements.txt | 4 ++-- setup.cfg | 2 +- spack.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index 376d0a0e5..21343e3ef 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - numpy - pip - pycocotools - - pyproj>=3.1 + - pyproj>=3.0 - python>=3.6 - pytorch-gpu>=1.7 - rarfile>=3 diff --git a/requirements.txt b/requirements.txt index b082c42c1..dce859710 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,8 +27,8 @@ pillow>=2.9 pycocotools # pydocstyle 6.1+ required for pyproject.toml support pydocstyle[toml]>=6.1 -# pyproj 3.1+ required as it contains threadsafe Transformer and CRS implementations -pyproj>=3.1 +# 3.0 is earliest version we tested, note: pyproj 3.1+ contains threadsafe Transformer and CRS implementations +pyproj>=3.0 # pytest 6+ required for pyproject.toml support pytest>=6 # pytest-cov 2.4+ required for pytest --cov flags diff --git a/setup.cfg b/setup.cfg index 24c2df92a..6880d08de 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ install_requires = matplotlib numpy pillow>=2.9 - pyproj>=3.1 + pyproj>=3.0 rasterio>=1.0.16 rtree>=0.5 shapely>=1.7.0 diff --git a/spack.yaml b/spack.yaml index 6324bbb07..0a988ca35 100644 --- a/spack.yaml +++ b/spack.yaml @@ -18,7 +18,7 @@ spack: - "py-omegaconf@2.1:" - "py-pycocotools" - "py-pydocstyle@6.1:+toml" - - "py-pyproj@3.1:" + - "py-pyproj@3.0:" - "py-pytest@6:" - "py-pytest-cov@2.4:" - "py-pytorch-lightning@1.3:"