Skip to content

Commit

Permalink
DEPS: Dropping support of Python 3.8 sertit#81
Browse files Browse the repository at this point in the history
  • Loading branch information
remi-braun committed Apr 13, 2023
1 parent 78bb41c commit a381cb2
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout source
uses: actions/checkout@v3

- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.9"

- name: Check that the current version isn't already on PyPi
run: |
Expand Down
52 changes: 5 additions & 47 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
EOREADER_CHANGES: eoreader/**/[^_]*.{py,xml}

lint:
image: python:3.8-buster
image: python:3.9-buster
stage: lint
script:
- python -m pip install --upgrade pip
Expand All @@ -26,7 +26,7 @@ lint:

# Test with data on local disk
pytest:
image: $EEO_DEPS:38
image: $EEO_DEPS:39
stage: test
variables:
CI_EOREADER_USE_S3: "0"
Expand Down Expand Up @@ -59,7 +59,7 @@ pytest:
# Test with data on S3
# TODO: create S3-specific CI ?
pytest_s3:
image: $EEO_DEPS:38
image: $EEO_DEPS:39
stage: test
variables:
EOREADER_USE_DASK: "0"
Expand Down Expand Up @@ -91,7 +91,7 @@ pytest_s3:

# Test SNAP with SNAP
pytest_end_to_end:
image: $EEO_DEPS:38
image: $EEO_DEPS:39
stage: test
variables:
EOREADER_USE_DASK: "0"
Expand All @@ -115,32 +115,6 @@ pytest_end_to_end:
- if: $CI_COMMIT_TAG
when: always

pytest_end_to_end39:
image: $EEO_DEPS:latest
stage: test
variables:
EOREADER_USE_DASK: "0"
before_script:
- python -m pip install --upgrade pip
- pip install --ignore-installed PyYAML
- pip install -e .
script:
- pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc CI/SCRIPTS_SNAP/test_all_sat_end_to_end_on_disk.py --log-cli-level DEBUG --capture=tee-sys
artifacts:
paths:
- ${CI_PROJECT_DIR}/cov_e2e.html
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
tags:
- sertit
- linux
- high_memory
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_NAME == "END_TO_END"'
when: always
- if: $CI_COMMIT_TAG
when: always
needs: [ "pytest_end_to_end" ]

pytest_end_to_end310:
image: $EEO_DEPS:310
stage: test
Expand All @@ -166,7 +140,7 @@ pytest_end_to_end310:
when: always
- if: $CI_COMMIT_TAG
when: always
needs: [ "pytest_end_to_end39" ]
needs: [ "pytest_end_to_end" ]

pytest_end_to_end311:
image: $EEO_DEPS:311
Expand Down Expand Up @@ -195,21 +169,6 @@ pytest_end_to_end311:
when: always
needs: [ "pytest_end_to_end310" ]

tox-linux-3.8:on-schedule:
image: $EO_CONTAINER:3.8
stage: weekly_tests
before_script:
- python -m pip install --upgrade pip
- pip install tox
script:
- tox -c tox.ini -e py38
tags:
- sertit
- linux
- high_memory
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_NAME == "WEEKLY"'

tox-linux-3.9:on-schedule:
image: $EO_CONTAINER:3.9
stage: weekly_tests
Expand All @@ -224,7 +183,6 @@ tox-linux-3.9:on-schedule:
- high_memory
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_NAME == "WEEKLY"'
needs: [ "tox-linux-3.8:on-schedule" ]

tox-windows:on-schedule:
stage: weekly_tests
Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Other

- DEPS: Dropping support of Python 3.8 ([#81](https://github.com/sertit/eoreader/issues/81))
- INTERNAL: Better management of logs for deprecation warnings
- INTERNAL: Refactoring `simplify_footprint` in `sertit` library
- DEPS: Pin sertit to 1.25.0
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ensure the code base is homogeneously formatted and easier to read. It's importa
exact same hooks in the Continuous Integration.

For now, you won't be able to run the test suite as we cannot provide an example of each product (some are licensed). We
will take care of that for you. Please be sure that your code is running on Python 3.8+.
will take care of that for you. Please be sure that your code is running on Python 3.9+.

## Release EOReader

Expand Down
2 changes: 1 addition & 1 deletion environment-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: eoreader-doc
channels:
- conda-forge
dependencies: # everything under this, installed by conda
- python=3.8
- python=3.9
- pip
- pip: # everything under this, installed by pip
- --extra-index-url ${WINDOWS_WHEELS} # Use windows wheels on Windows
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: eoreader
channels:
- conda-forge
dependencies: # everything under this, installed by conda
- python=3.8
- python=3.9
- pip
- pip: # everything under this, installed by pip
- --extra-index-url ${WINDOWS_WHEELS} # Use windows wheels on Windows
Expand Down
2 changes: 1 addition & 1 deletion readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ build:

# Explicitly set the version of Python and its requirements
python:
version: "3.8"
version: "3.9"
install:
- requirements: requirements-doc.txt
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ scipy
pyresample
rasterio>=1.3.0
xarray>=0.18.0
rioxarray>=0.4.0
rioxarray>=0.10.0

# Vector libs
rtree
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"Natural Language :: English",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -59,7 +58,7 @@
],
package_data={"": ["LICENSE", "NOTICE"], "eoreader.data": ["*.xml"]},
include_package_data=True,
python_requires=">=3.8",
python_requires=">=3.9",
project_urls={
"Bug Tracker": f"{__url__}/issues/",
"Documentation": __documentation__,
Expand Down
4 changes: 2 additions & 2 deletions tox-conda.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
envlist = py37, py38, py39, linters
envlist = py39, py310, py311, linters
requires = tox-conda

[gh-actions]
python =
3.11: py311
3.10: py310
3.9: py39
3.8: py38

[testenv]
commands = pytest -v --durations=0 --cov-report term --cov-report xml:{toxinidir}{/}cov.xml --cov={toxinidir}{/}eoreader CI{/}SCRIPTS
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
envlist = py37, py38, py39, linters
envlist = py39, py310, py311, linters
skipdist = true

[gh-actions]
python =
3.11: py311
3.10: py310
3.9: py39
3.8: py38

[testenv]
commands = pytest -v --durations=0 --cov-report term --cov-report xml:{toxinidir}{/}cov.xml --cov={toxinidir}{/}eoreader CI{/}SCRIPTS
Expand Down

0 comments on commit a381cb2

Please sign in to comment.