Skip to content

Commit

Permalink
CI/DEPS: update CI, require Py3.9 (#237)
Browse files Browse the repository at this point in the history
  • Loading branch information
martinfleis committed Mar 5, 2024
1 parent afc96d6 commit 320250d
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,24 @@ on:
jobs:
unittests:
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
os: [macos, ubuntu, windows]
os: [ubuntu-latest]
environment-file:
[ci/envs/38-minimal.yaml, ci/envs/311-latest-conda-forge.yaml]
- ci/envs/39-minimal.yaml
- ci/envs/310-conda-forge.yaml
- ci/envs/311-conda-forge.yaml
- ci/envs/312-latest-conda-forge.yaml
include:
- os: ubuntu
environment-file: ci/envs/310-conda-forge.yaml
- os: ubuntu
environment-file: ci/envs/39-conda-forge.yaml
- os: macos-latest
environment-file: ci/envs/312-latest-conda-forge.yaml
- os: macos-14 # apple silicon
environment-file: ci/envs/312-latest-conda-forge.yaml
- os: windows-latest
environment-file: ci/envs/312-latest-conda-forge.yaml
defaults:
run:
shell: bash -l {0}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `contextily`: context geo tiles in Python

`contextily` is a small Python 3 (3.8 and above) package to retrieve tile maps from the
`contextily` is a small Python 3 (3.9 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
Expand Down Expand Up @@ -33,7 +33,7 @@ package. This includes some popular tile maps, such as:

## Installation

**Python 3 only** (3.8 and above)
**Python 3 only** (3.9 and above)

[Latest released version](https://github.com/geopandas/contextily/releases/), using pip:

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test-environment
channels:
- conda-forge
dependencies:
- python=3.8
- python=3.12
# required
- geopy
- matplotlib
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ classifiers = [
"Programming Language :: Python :: 3",
"Framework :: Matplotlib",
]
requires-python = ">=3.8"
requires-python = ">=3.9"
dependencies = [
"geopy",
"matplotlib",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cx.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test_warp_tiles():
)
assert wimg[100, 100, :].tolist() == [247, 246, 241, 255]
assert wimg[100, 200, :].tolist() == [246, 246, 241, 255]
assert wimg[20, 120, :].tolist() == [139, 128, 149, 255]
assert wimg[20, 120, :].tolist() == [139, 128, 148, 255]


@pytest.mark.network
Expand All @@ -144,7 +144,7 @@ def test_warp_img_transform():
wimg, _ = cx.warp_img_transform(img, rtr.transform, rtr.crs, "epsg:4326")
assert wimg[:, 100, 100].tolist() == [247, 246, 241, 255]
assert wimg[:, 100, 200].tolist() == [246, 246, 241, 255]
assert wimg[:, 20, 120].tolist() == [139, 128, 149, 255]
assert wimg[:, 20, 120].tolist() == [139, 128, 148, 255]


def test_howmany():
Expand Down

0 comments on commit 320250d

Please sign in to comment.