diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6e5e99e..2a0da2b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,8 +17,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 - uses: pre-commit/action@v2.0.3 Test: @@ -35,28 +35,28 @@ jobs: postgis: [false] dev: [false] env: - - ci/envs/37-minimal.yaml - - ci/envs/38-no-optional-deps.yaml - - ci/envs/37-pd11.yaml - - ci/envs/37-latest-defaults.yaml - - ci/envs/37-latest-conda-forge.yaml + - ci/envs/38-minimal.yaml + - ci/envs/39-no-optional-deps.yaml + - ci/envs/38-pd11-defaults.yaml + - ci/envs/38-latest-defaults.yaml - ci/envs/38-latest-conda-forge.yaml + - ci/envs/39-pd12-conda-forge.yaml - ci/envs/39-latest-conda-forge.yaml - ci/envs/310-latest-conda-forge.yaml include: - - env: ci/envs/37-latest-conda-forge.yaml - os: macos-latest - postgis: false - dev: false - env: ci/envs/38-latest-conda-forge.yaml os: macos-latest postgis: false dev: false - - env: ci/envs/37-latest-conda-forge.yaml + - env: ci/envs/39-latest-conda-forge.yaml + os: macos-latest + postgis: false + dev: false + - env: ci/envs/38-latest-conda-forge.yaml os: windows-latest postgis: false dev: false - - env: ci/envs/38-latest-conda-forge.yaml + - env: ci/envs/39-latest-conda-forge.yaml os: windows-latest postgis: false dev: false @@ -65,7 +65,7 @@ jobs: dev: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Conda uses: conda-incubator/setup-miniconda@v2 @@ -106,7 +106,7 @@ jobs: pytest -v -r s -n auto --color=yes --cov=geopandas --cov-append --cov-report term-missing --cov-report xml geopandas/ - name: Test with PostGIS - if: contains(matrix.env, '38-latest-conda-forge.yaml') && contains(matrix.os, 'ubuntu') + if: contains(matrix.env, '39-pd12-conda-forge.yaml') && contains(matrix.os, 'ubuntu') env: PGUSER: postgres PGPASSWORD: postgres @@ -118,7 +118,7 @@ jobs: pytest -v -r s --color=yes --cov=geopandas --cov-append --cov-report term-missing --cov-report xml geopandas/io/tests/test_sql.py | tee /dev/stderr | if grep SKIPPED >/dev/null;then echo "TESTS SKIPPED, FAILING" && exit 1;fi - name: Test docstrings - if: contains(matrix.env, '38-latest-conda-forge.yaml') && contains(matrix.os, 'ubuntu') + if: contains(matrix.env, '39-pd12-conda-forge.yaml') && contains(matrix.os, 'ubuntu') env: USE_PYGEOS: 1 run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40fecd6..76bbf2f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,6 @@ In general, GeoPandas follows the conventions of the pandas project where applicable. Please read the [contributing guidelines](https://geopandas.readthedocs.io/en/latest/community/contributing.html). - In particular, when submitting a pull request: - Install the requirements for the development environment (one can do this @@ -39,7 +38,7 @@ is a great way to get started if you'd like to make a contribution. Style ----- -- GeoPandas supports Python 3.7+ only. The last version of GeoPandas +- GeoPandas supports Python 3.8+ only. The last version of GeoPandas supporting Python 2 is 0.6. - GeoPandas follows [the PEP 8 diff --git a/ci/envs/38-latest-conda-forge.yaml b/ci/envs/38-latest-conda-forge.yaml index 6d2348f..c6ea712 100644 --- a/ci/envs/38-latest-conda-forge.yaml +++ b/ci/envs/38-latest-conda-forge.yaml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.8 # required - - pandas=1.2 + - pandas - shapely - fiona - pyproj @@ -23,12 +23,6 @@ dependencies: - xyzservices - scipy - geopy - # installed in tests.yaml, because not available on windows - # - postgis - SQLalchemy - - psycopg2 - libspatialite - - geoalchemy2 - pyarrow - # doctest testing - - pytest-doctestplus diff --git a/ci/envs/37-latest-defaults.yaml b/ci/envs/38-latest-defaults.yaml similarity index 96% rename from ci/envs/37-latest-defaults.yaml rename to ci/envs/38-latest-defaults.yaml index 071d3ea..a4c4ef7 100644 --- a/ci/envs/37-latest-defaults.yaml +++ b/ci/envs/38-latest-defaults.yaml @@ -2,7 +2,7 @@ name: test channels: - defaults dependencies: - - python=3.7 + - python=3.8 # required - pandas - shapely diff --git a/ci/envs/37-minimal.yaml b/ci/envs/38-minimal.yaml similarity index 96% rename from ci/envs/37-minimal.yaml rename to ci/envs/38-minimal.yaml index 9df7b6d..b697c63 100644 --- a/ci/envs/37-minimal.yaml +++ b/ci/envs/38-minimal.yaml @@ -3,7 +3,7 @@ channels: - defaults - conda-forge dependencies: - - python=3.7 + - python=3.8 # required - numpy=1.18 - pandas==1.0.5 diff --git a/ci/envs/37-pd11.yaml b/ci/envs/38-pd11-defaults.yaml similarity index 96% rename from ci/envs/37-pd11.yaml rename to ci/envs/38-pd11-defaults.yaml index a58c7ec..eb524c2 100644 --- a/ci/envs/37-pd11.yaml +++ b/ci/envs/38-pd11-defaults.yaml @@ -2,7 +2,7 @@ name: test channels: - defaults dependencies: - - python=3.7 + - python=3.8 # required - pandas=1.1 - shapely diff --git a/ci/envs/38-no-optional-deps.yaml b/ci/envs/39-no-optional-deps.yaml similarity index 92% rename from ci/envs/38-no-optional-deps.yaml rename to ci/envs/39-no-optional-deps.yaml index 7261cc6..cb6f036 100644 --- a/ci/envs/38-no-optional-deps.yaml +++ b/ci/envs/39-no-optional-deps.yaml @@ -2,7 +2,7 @@ name: test channels: - conda-forge dependencies: - - python=3.8 + - python=3.9 # required - pandas - shapely diff --git a/ci/envs/37-latest-conda-forge.yaml b/ci/envs/39-pd12-conda-forge.yaml similarity index 65% rename from ci/envs/37-latest-conda-forge.yaml rename to ci/envs/39-pd12-conda-forge.yaml index dadd2c4..fc675bf 100644 --- a/ci/envs/37-latest-conda-forge.yaml +++ b/ci/envs/39-pd12-conda-forge.yaml @@ -2,9 +2,9 @@ name: test channels: - conda-forge dependencies: - - python=3.7 + - python=3.9 # required - - pandas + - pandas=1.2 - shapely - fiona - pyproj @@ -23,6 +23,12 @@ dependencies: - xyzservices - scipy - geopy + # installed in tests.yaml, because not available on windows + # - postgis - SQLalchemy + - psycopg2 - libspatialite + - geoalchemy2 - pyarrow + # doctest testing + - pytest-doctestplus diff --git a/doc/source/community/contributing.rst b/doc/source/community/contributing.rst index 21444db..1eb9520 100644 --- a/doc/source/community/contributing.rst +++ b/doc/source/community/contributing.rst @@ -44,7 +44,7 @@ In particular, when submitting a pull request: imports when possible, and explicit relative imports for local imports when necessary in tests. -- GeoPandas supports Python 3.7+ only. The last version of GeoPandas +- GeoPandas supports Python 3.8+ only. The last version of GeoPandas supporting Python 2 is 0.6. diff --git a/setup.py b/setup.py index ca1d0ec..277d684 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ setup( "geopandas.tools.tests", ], package_data={"geopandas": data_files}, - python_requires=">=3.7", + python_requires=">=3.8", install_requires=INSTALL_REQUIRES, cmdclass=versioneer.get_cmdclass(), )