From 4f8396188d116421469c178a0f540a9d6a584d3e Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Wed, 1 Feb 2023 13:42:02 +0100 Subject: [PATCH] CI: bump python versions to 3.8-3.11 (#209) --- .github/workflows/tests.yaml | 14 +++++++------- README.md | 6 ++---- ...atest-conda-forge.yaml => 310-conda-forge.yaml} | 0 ...37-minimal.yaml => 311-latest-conda-forge.yaml} | 2 +- ci/envs/{38-conda-forge.yaml => 38-minimal.yaml} | 0 5 files changed, 10 insertions(+), 12 deletions(-) rename ci/envs/{310-latest-conda-forge.yaml => 310-conda-forge.yaml} (100%) rename ci/envs/{37-minimal.yaml => 311-latest-conda-forge.yaml} (93%) rename ci/envs/{38-conda-forge.yaml => 38-minimal.yaml} (100%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 5018d8a4..de3fd2bd 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -3,15 +3,14 @@ name: Tests on: push: branches: - - '*' + - "*" pull_request: branches: - - '*' + - "*" schedule: - - cron: '59 23 * * 3' + - cron: "59 23 * * 3" jobs: - unittests: name: ${{ matrix.os }}, ${{ matrix.environment-file }} runs-on: ${{ matrix.os }}-latest @@ -20,10 +19,11 @@ jobs: fail-fast: false matrix: os: [macos, ubuntu, windows] - environment-file: [ci/envs/37-minimal.yaml, ci/envs/310-latest-conda-forge.yaml] + environment-file: + [ci/envs/38-minimal.yaml, ci/envs/311-latest-conda-forge.yaml] include: - os: ubuntu - environment-file: ci/envs/38-conda-forge.yaml + environment-file: ci/envs/310-conda-forge.yaml - os: ubuntu environment-file: ci/envs/39-conda-forge.yaml @@ -35,7 +35,7 @@ jobs: uses: mamba-org/provision-with-micromamba@main with: environment-file: ${{ matrix.environment-file }} - micromamba-version: 'latest' + micromamba-version: "latest" - name: Install contextily shell: bash -l {0} diff --git a/README.md b/README.md index 523ba05e..6a7a0a38 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ # `contextily`: context geo tiles in Python -`contextily` is a small Python 3 (3.7 and above) package to retrieve tile maps from the +`contextily` is a small Python 3 (3.8 and above) package to retrieve tile maps from the internet. It can add those tiles as basemap to matplotlib figures or write tile maps to disk into geospatial raster files. Bounding boxes can be passed in both WGS84 (`EPSG:4326`) and Spheric Mercator (`EPSG:3857`). See the notebook `contextily_guide.ipynb` for usage. - [![Tests](https://github.com/geopandas/contextily/actions/workflows/tests.yaml/badge.svg)](https://github.com/geopandas/contextily/actions/workflows/tests.yaml) [![codecov](https://codecov.io/gh/geopandas/contextily/branch/main/graph/badge.svg?token=5Eu3L1peBb)](https://codecov.io/gh/geopandas/contextily) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/geopandas/contextily/main?urlpath=lab/tree/notebooks/intro_guide.ipynb) @@ -34,7 +33,7 @@ package. This includes some popular tile maps, such as: ## Installation -**Python 3 only** (3.7 and above) +**Python 3 only** (3.8 and above) [Latest released version](https://github.com/geopandas/contextily/releases/), using pip: @@ -48,7 +47,6 @@ or conda: conda install contextily ``` - ## Contributors `contextily` is developed by a community of enthusiastic volunteers. You can see a full list [here](https://github.com/geopandas/contextily/graphs/contributors). diff --git a/ci/envs/310-latest-conda-forge.yaml b/ci/envs/310-conda-forge.yaml similarity index 100% rename from ci/envs/310-latest-conda-forge.yaml rename to ci/envs/310-conda-forge.yaml diff --git a/ci/envs/37-minimal.yaml b/ci/envs/311-latest-conda-forge.yaml similarity index 93% rename from ci/envs/37-minimal.yaml rename to ci/envs/311-latest-conda-forge.yaml index eaef64f4..8b9c6983 100644 --- a/ci/envs/37-minimal.yaml +++ b/ci/envs/311-latest-conda-forge.yaml @@ -2,7 +2,7 @@ name: test-environment channels: - conda-forge dependencies: - - python=3.7 + - python=3.11 # required - geopy - matplotlib diff --git a/ci/envs/38-conda-forge.yaml b/ci/envs/38-minimal.yaml similarity index 100% rename from ci/envs/38-conda-forge.yaml rename to ci/envs/38-minimal.yaml