From 8b123e67e90884f4cc7421897c564107fd904d5c Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 15 Jun 2024 17:23:22 -0400 Subject: [PATCH] bump and sync min reqs - #141 --- ci/envs/310-latest.yaml | 10 +++++----- ci/envs/310-minimal.yaml | 11 ++++++----- ci/envs/311-latest.yaml | 10 +++++----- ci/envs/312-dev.yaml | 20 ++++++++++---------- ci/envs/312-latest.yaml | 10 +++++----- environment.yml | 7 +++++-- pyproject.toml | 15 ++++++++------- 7 files changed, 44 insertions(+), 39 deletions(-) diff --git a/ci/envs/310-latest.yaml b/ci/envs/310-latest.yaml index dbfe900..6a4904b 100644 --- a/ci/envs/310-latest.yaml +++ b/ci/envs/310-latest.yaml @@ -3,15 +3,15 @@ channels: - conda-forge dependencies: - python=3.10 - - scipy + - geopandas + - libpysal + - matplotlib - numpy - pandas - - matplotlib - - libpysal + - scipy + - shapely # tests - scikit-learn - - shapely - - geopandas - statsmodels - pytest - pytest-cov diff --git a/ci/envs/310-minimal.yaml b/ci/envs/310-minimal.yaml index 8a31e9d..9a2ae1e 100644 --- a/ci/envs/310-minimal.yaml +++ b/ci/envs/310-minimal.yaml @@ -3,15 +3,16 @@ channels: - conda-forge dependencies: - python=3.10 - - scipy=1.8 + - geopandas=0.12 + - libpysal=4.8 + - matplotlib=3.4 - numpy=1.21 - pandas=1.3 - - matplotlib=3.4 - - libpysal=4.5 + - scipy=1.11 + - shapely=2 # tests - scikit-learn=1.2 - - shapely - - geopandas + - statsmodels - pytest - pytest-cov - codecov diff --git a/ci/envs/311-latest.yaml b/ci/envs/311-latest.yaml index 530a659..f601fc4 100644 --- a/ci/envs/311-latest.yaml +++ b/ci/envs/311-latest.yaml @@ -3,15 +3,15 @@ channels: - conda-forge dependencies: - python=3.11 - - scipy + - geopandas + - libpysal + - matplotlib - numpy - pandas - - matplotlib - - libpysal + - scipy + - shapely # tests - scikit-learn - - shapely - - geopandas - statsmodels - pytest - pytest-cov diff --git a/ci/envs/312-dev.yaml b/ci/envs/312-dev.yaml index 98b1b9e..e6c698b 100644 --- a/ci/envs/312-dev.yaml +++ b/ci/envs/312-dev.yaml @@ -3,25 +3,25 @@ channels: - conda-forge dependencies: - python=3.12 - - numpy - - pandas - - matplotlib + - folium - libpysal - mapclassify - - folium - # tests + - matplotlib + - numpy + - pandas - shapely - - pyproj + # tests + - codecov - fiona - pytest - pytest-cov - - codecov + - pyproj - pip - pip: - --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple - - git+https://github.com/geopandas/geopandas.git - - git+https://github.com/pysal/libpysal.git + - KDEpy - scipy - scikit-learn - statsmodels - - KDEpy + - git+https://github.com/pysal/libpysal.git + - git+https://github.com/geopandas/geopandas.git diff --git a/ci/envs/312-latest.yaml b/ci/envs/312-latest.yaml index 5c27f15..ad539c3 100644 --- a/ci/envs/312-latest.yaml +++ b/ci/envs/312-latest.yaml @@ -3,15 +3,15 @@ channels: - conda-forge dependencies: - python=3.12 - - scipy + - geopandas + - libpysal + - matplotlib - numpy - pandas - - matplotlib - - libpysal + - scipy + - shapely # tests - scikit-learn - - shapely - - geopandas - statsmodels - pytest - pytest-cov diff --git a/environment.yml b/environment.yml index 933fc35..05edf9b 100644 --- a/environment.yml +++ b/environment.yml @@ -3,8 +3,11 @@ channels: - conda-forge - defaults dependencies: - - pandas + - python + - geopandas - libpysal - matplotlib + - numpy - pandas - - scipy>=0.11 + - scipy + - shapley diff --git a/pyproject.toml b/pyproject.toml index 6892926..4c2d849 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,12 +27,12 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - "numpy", - "pandas", - "scipy >=1.8", - "libpysal >=4", - "matplotlib", - "geopandas", + "libpysal >=4.8", + "geopandas >= 0.12", + "matplotlib >=3.4", + "numpy >=1.21", + "pandas >=1.3, !=1.5.0", + "scipy >=1.11", "shapely >=2" ] @@ -53,12 +53,13 @@ docs = [ "myst-parser" ] tests = [ - "geopandas", "codecov", "coverage", "pytest", "pytest-mpl", "pytest-cov", + "scikit-learn >=1.2", + "statsmodels", "watermark", ]