summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Rivera <stefanor@debian.org>2025-05-03 13:02:45 -0400
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2025-05-03 22:47:35 +0000
commitfd5a3b06be4a2c7c64653e918bfcb8845aeb8751 (patch)
treeca6be119d36688b967fdee48786957e300ceb680
parent9cdc17ac2b79f9102b0f3a6a75b10e7213e3c70a (diff)
parent170379536bff1470f837caca1aa1055df0860ae8 (diff)
0.14.3-1 (patches applied)applied/0.14.3-1applied/ubuntu/stonkingapplied/ubuntu/resolute-develapplied/ubuntu/resoluteapplied/ubuntu/questing-proposedapplied/ubuntu/questing-develapplied/ubuntu/questing
Imported using git-ubuntu import.
Diffstat
-rw-r--r--.github/workflows/release.yml10
-rw-r--r--.github/workflows/tests.yml8
-rw-r--r--.github/workflows/zizmor.yml8
-rw-r--r--cachecontrol/__init__.py2
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/patches/no-doesitcache-script.patch4
-rw-r--r--docs/release_notes.rst6
-rw-r--r--pyproject.toml9
-rw-r--r--tests/test_adapter.py7
10 files changed, 44 insertions, 20 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3d5c810..4d79dd3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,8 @@ on:
name: release
+permissions: {}
+
jobs:
pypi:
name: upload release to PyPI
@@ -19,13 +21,13 @@ jobs:
contents: write
steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
- python-version: "3.x"
+ python-version-file: pyproject.toml
- name: deps
run: python -m pip install -U build
@@ -34,5 +36,5 @@ jobs:
run: python -m build
- name: publish
- uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # release/v1
+ uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 96250b9..59ae8ab 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,6 +8,8 @@ on:
branches: ["master"]
workflow_dispatch:
+permissions: {}
+
jobs:
tests:
name: "Python ${{ matrix.python-version }} ${{ matrix.os }}"
@@ -16,15 +18,15 @@ jobs:
strategy:
fail-fast: false
matrix:
- python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+ python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
os: ["macos-latest", "windows-latest", "ubuntu-latest"]
steps:
- - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: "${{ matrix.python-version }}"
allow-prereleases: true
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 942e712..3880ad1 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -6,6 +6,8 @@ on:
pull_request:
branches: ["**"]
+permissions: {}
+
jobs:
zizmor:
name: zizmor latest via PyPI
@@ -17,12 +19,12 @@ jobs:
actions: read
steps:
- name: Checkout repository
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- name: Install the latest version of uv
- uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v4
+ uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
- name: Run zizmor 🌈
run: uvx zizmor --format sarif . > results.sarif
@@ -30,7 +32,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload SARIF file
- uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+ uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
with:
sarif_file: results.sarif
category: zizmor
diff --git a/cachecontrol/__init__.py b/cachecontrol/__init__.py
index 5493afa..62e00b1 100644
--- a/cachecontrol/__init__.py
+++ b/cachecontrol/__init__.py
@@ -9,7 +9,7 @@ Make it easy to import from cachecontrol without long namespaces.
__author__ = "Eric Larson"
__email__ = "eric@ionrock.org"
-__version__ = "0.14.2"
+__version__ = "0.14.3"
from cachecontrol.adapter import CacheControlAdapter
from cachecontrol.controller import CacheController
diff --git a/debian/changelog b/debian/changelog
index 4741f93..313ba35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-cachecontrol (0.14.3-1) unstable; urgency=medium
+
+ * New upstream point release.
+ * Refresh patches.
+ * Bump Standards-Version to 4.7.2, no changes needed.
+
+ -- Stefano Rivera <stefanor@debian.org> Sat, 03 May 2025 13:02:45 -0400
+
python-cachecontrol (0.14.2-1) unstable; urgency=medium
* New upstream point release.
diff --git a/debian/control b/debian/control
index 2d2fb5e..4054adb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
python3-pytest <!nocheck>,
python3-redis <!nocheck>,
python3-requests <!nocheck>,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/python-team/packages/python-cachecontrol.git
Vcs-Browser: https://salsa.debian.org/python-team/packages/python-cachecontrol
diff --git a/debian/patches/no-doesitcache-script.patch b/debian/patches/no-doesitcache-script.patch
index 5f62482..ed616ff 100644
--- a/debian/patches/no-doesitcache-script.patch
+++ b/debian/patches/no-doesitcache-script.patch
@@ -8,10 +8,10 @@ Don't install the undocumented and unnecessary doesitcache script.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
-index 5b6910b..fdb60a4 100644
+index d8890eb..8fd3861 100644
--- a/pyproject.toml
+++ b/pyproject.toml
-@@ -65,7 +65,7 @@ dev = [
+@@ -64,7 +64,7 @@ dev = [
]
[project.scripts]
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 3b63b5e..155dd1c 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -7,6 +7,11 @@
Release Notes
===============
+0.14.3
+======
+
+* Drop support for Python 3.8.
+
0.14.2
======
@@ -16,7 +21,6 @@
0.14.1
======
-* Drop support for Python 3.8.
* Explicitly support Python 3.13.
0.14.0
diff --git a/pyproject.toml b/pyproject.toml
index fdb60a4..8fd3861 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
-requires = ["flit_core >=3.2,<4"]
+requires = ["flit_core >=3.11,<4"]
build-backend = "flit_core.buildapi"
[tool.flit.module]
@@ -13,7 +13,8 @@ name = "CacheControl"
dynamic = ["version"]
description = "httplib2 caching for requests"
readme = "README.rst"
-license = { file = "LICENSE.txt" }
+license = "Apache-2.0"
+license-files = ["LICENSE.txt"]
authors = [
{ name = "Eric Larson", email = "ericlarson@ionrock.com" },
{ name = "Frost Ming", email = "me@frostming.com" },
@@ -22,9 +23,7 @@ authors = [
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Web Environment",
- "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
- "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
@@ -34,7 +33,7 @@ classifiers = [
]
keywords = ["requests", "http", "caching", "web"]
dependencies = ["requests >= 2.16.0", "msgpack >= 0.5.2, < 2.0.0"]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
[project.urls]
Homepage = "https://pypi.org/project/CacheControl/"
diff --git a/tests/test_adapter.py b/tests/test_adapter.py
index 7fd0c59..7b299a2 100644
--- a/tests/test_adapter.py
+++ b/tests/test_adapter.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
import gc
+import platform
import weakref
from unittest import mock
@@ -82,6 +83,12 @@ class TestSessionActions:
# We should not break this.
resp = None
+ if platform.python_implementation() == "PyPy":
+ # NOTE: Need to explicitly tell PyPy to collect at this point.
+ # See: https://github.com/psf/cachecontrol/issues/351
+ # See: https://doc.pypy.org/en/latest/cpython_differences.html#differences-related-to-garbage-collection-strategies
+ gc.collect()
+
# Below this point, it should be closed because there are no more references
# to the session response.
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-09 00:15:58 +0000