Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Python 3.7 #881

Merged
merged 3 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.9'] # , '3.12-dev'
include:
# TODO: revert this to simple version array
- python-version: '3.8'
- python-version: '3.9'
- python-version: '3.10'
- python-version: '3.11'
- python-version: 'pypy3.9'
full-version: 'pypy3.9-7.3.11'
# - python-version: '3.12'
# full-version: '3.12-dev'
fail-fast: false
services:
nginx:
Expand All @@ -30,10 +39,9 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.full-version || matrix.python-version }}
- uses: snok/install-poetry@v1.3
with:
version: 1.5.1 # For python 3.7 compatibility
virtualenvs-in-project: true

# Start integration test databases
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
python-version: ${{ env.LATEST_PY_VERSION }}
- uses: snok/install-poetry@v1.3
with:
version: 1.5.1 # For python 3.7 compatibility
virtualenvs-in-project: true

# Start integration test databases
Expand Down Expand Up @@ -92,7 +91,6 @@ jobs:
python-version: ${{ env.LATEST_PY_VERSION }}
- uses: snok/install-poetry@v1.3
with:
version: 1.5.1 # For python 3.7 compatibility
virtualenvs-in-project: true

# Cache packages per python version, and reuse until lockfile changes
Expand All @@ -118,7 +116,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.9'] # , '3.12-dev'
python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy3.9'] # , '3.12-dev'
requests-version: [latest]
exclude:
- os: windows-latest
Expand Down Expand Up @@ -169,7 +167,6 @@ jobs:
python-version: ${{ matrix.python-version }}
- uses: snok/install-poetry@v1.3
with:
version: 1.5.1 # For python 3.7 compatibility
virtualenvs-in-project: true

# Cache packages per python version, and reuse until lockfile changes
Expand Down Expand Up @@ -205,7 +202,6 @@ jobs:
python-version: ${{ env.LATEST_PY_VERSION }}
- uses: snok/install-poetry@v1.3
with:
version: 1.5.1 # For python 3.7 compatibility
virtualenvs-in-project: true

- name: Set pre-release version
Expand Down
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* Use timezone-aware UTC datetimes for all internal expiration values
* Add `CachedSession.wrap()` classmethod to add caching to an existing `requests.Session` object

⚠️ **Deprecations & removals:**
* Drop support for python 3.7

## 1.1.0 (2023-06-30)

⚙️ **Session settings:**
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
LIVE_DOCS_WATCH = ['requests_cache', 'examples']
CLEAN_DIRS = ['dist', 'build', join('docs', '_build'), join('docs', 'modules')]

PYTHON_VERSIONS = ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.9']
PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', 'pypy3.9']
UNIT_TESTS = join('tests', 'unit')
INTEGRATION_TESTS = join('tests', 'integration')
STRESS_TEST_MULTIPLIER = 10
Expand Down
50 changes: 11 additions & 39 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ include = [
"Issues" = "https://github.com/requests-cache/requests-cache/issues"

[tool.poetry.dependencies]
python = "^3.7" # requests requires python >=3.7, <4.0
JWCook marked this conversation as resolved.
Show resolved Hide resolved
python = ">=3.8" # requests requires python >=3.8

# Required dependencies
requests = ">=2.22" # Needs no introduction
Expand Down Expand Up @@ -63,7 +63,7 @@ sphinx-copybutton = {optional=true, version=">=0.5"}
sphinx-design = {optional=true, version=">=0.2"}
sphinx-notfound-page = {optional=true, version=">=0.8"}
sphinxcontrib-apidoc = {optional=true, version=">=0.3"}
sphinxext-opengraph = {optional=true, version=">=0.6", python=">=3.8"}
sphinxext-opengraph = {optional=true, version=">=0.6"}

[tool.poetry.extras]
# Package extras for optional backend dependencies
Expand Down Expand Up @@ -105,13 +105,12 @@ pre-commit = "^2.19"

# For convenience in local development
nox = "^2023.4"
nox-poetry = "^1.0.0"
# TODO: Remove the 'python' constraint once nox-poetry drops its own constraint
# https://github.com/cjolowicz/nox-poetry/pull/1213
nox-poetry = {version = "^1.0.0", python = "<4"}
rich = ">=10.0"
sphinx-autobuild = "^2021.3.14"

# Workaround for missing dependency on python 3.7
zipp = {version = ">=3.8", python = "<3.8"}

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
Expand Down Expand Up @@ -163,3 +162,4 @@ format = 'grouped'
line-length = 120
select = ['B', 'C4','C90', 'E', 'F']
ignore = ['B023']
target-version = 'py38'