Skip to content

Commit 12ac533

Browse files
authored
Drop Python < 3.10, update runtime dependencies (#854)
This updates dependencies for renewed development here, and in the process, drops support for Python < 3.10. We *mainly* supported older Python versions for Google Colab, and Colab is not on Python 3.11. Unfortunately, we can’t go newer than Python 3.10 either, since we need cchardet support (for now).
1 parent 6a2a11b commit 12ac533

15 files changed

+5597
-7330
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ commands:
1919
- checkout
2020
- restore_cache:
2121
keys:
22-
- processing-{{ arch }}-<< parameters.python-version >>-v2-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "requirements-docs.txt" }}
23-
- processing-{{ arch }}-<< parameters.python-version >>-v2-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-
24-
- processing-{{ arch }}-<< parameters.python-version >>-v2-{{ checksum "requirements.txt" }}-
25-
- processing-{{ arch }}-<< parameters.python-version >>-v2-
22+
- processing-{{ arch }}-<< parameters.python-version >>-v3-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "requirements-docs.txt" }}
23+
- processing-{{ arch }}-<< parameters.python-version >>-v3-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-
24+
- processing-{{ arch }}-<< parameters.python-version >>-v3-{{ checksum "requirements.txt" }}-
25+
- processing-{{ arch }}-<< parameters.python-version >>-v3-
2626

2727
# Bundle install dependencies
2828
- run:
@@ -47,7 +47,7 @@ commands:
4747
4848
# Store bundle cache
4949
- save_cache:
50-
key: processing-{{ arch }}-<< parameters.python-version >>-v2-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "requirements-docs.txt" }}
50+
key: processing-{{ arch }}-<< parameters.python-version >>-v3-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "requirements-docs.txt" }}
5151
paths:
5252
- venv
5353

@@ -145,7 +145,7 @@ workflows:
145145
- test:
146146
matrix:
147147
parameters:
148-
python-version: ["3.7", "3.8", "3.9", "3.10"]
148+
python-version: ["3.10"]
149149
- lint
150150
- docs
151151
- build_docker

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base Image -----------------------------------------------------------------
2-
FROM python:3.10.10-slim AS base
2+
FROM python:3.10.16-slim AS base
33
LABEL org.opencontainers.image.authors="enviroDGI@gmail.com"
44
LABEL maintainer="enviroDGI@gmail.com"
55

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Legacy projects that may be revisited:
3535

3636
## Installation Instructions
3737

38-
1. Get Python 3.7 or later. If you don't have the right version, we recommend using
38+
1. Get Python 3.10 or later. If you don't have the right version, we recommend using
3939
[conda](https://conda.io/miniconda.html) or [pyenv](https://github.com/pyenv/pyenv) to install it. (You don't need admin privileges to install or use them, and they won't interfere with any other installations of Python already on your system.)
4040

4141
2. Install libxml2 and libxslt. (This package uses lxml, which requires your system to have the libxml2 and libxslt libraries.)

docs/source/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Installation
33
************
44

5-
This package uses new features of Python and it requires Python 3.7+.
5+
This package uses new features of Python and it requires Python 3.10+.
66
The easiest way to get a modern version of Python is to
77
`install conda <https://conda.io/docs/user-guide/install/index.html#regular-installation>`_.
88
Happily, conda will not interfere with any existing Python installation(s), and

requirements-dev.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
coverage ~=7.1
2-
pyflakes ~=3.0.1
1+
coverage ~=7.6.10
2+
pyflakes ~=3.2.0
33
pytest ~=7.2.1
4-
vcrpy ~=4.2.1
5-
requests-mock ~=1.10.0
4+
vcrpy ~=7.0.0
5+
requests-mock ~=1.12.1

requirements.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
cchardet ==2.1.7
2-
cloudpathlib[s3] ~=0.13.0
3-
python-dateutil ~=2.8.2
2+
cloudpathlib[s3] ~=0.20.0
3+
python-dateutil ~=2.9.0
44
docopt ~=0.6.2
5-
lxml ~=4.9.2
6-
pypdf[crypto] ~=3.3.0
5+
lxml ~=5.3.0
6+
pypdf[crypto] ~=5.1.0
77
sentry-sdk ~=1.14.0
8-
requests ~=2.28.2
9-
toolz ~=0.12.0
10-
tqdm ~=4.64.1
11-
wayback ~=0.4.0
8+
requests ~=2.32.3
9+
# We need to specify urllib3 to make sure everyone is using the same version;
10+
# there are messy details between v1 & v2 even though requests supports both.
11+
urllib3 ~=2.3.0
12+
toolz ~=1.0.0
13+
tqdm ~=4.67.1
14+
wayback ~=0.4.5

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import versioneer
1010

1111

12-
if sys.version_info < (3, 7):
13-
raise RuntimeError("Python version is {}. Requires 3.7 or greater."
12+
if sys.version_info < (3, 10):
13+
raise RuntimeError("Python version is {}. Requires 3.10 or greater."
1414
"".format(sys.version_info))
1515

1616

0 commit comments

Comments
 (0)