Skip to content

Commit d80fd0c

Browse files
vavsabclaude
andcommitted
fix(#868k5bbdr): Rename package back to diskcache for git source override
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 4225a43 commit d80fd0c

3 files changed

Lines changed: 25 additions & 22 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ jobs:
4444
- name: Run tests
4545
run: tox -e py
4646

47-
publish:
47+
tag:
4848
needs: tests
4949
if: github.ref == 'refs/heads/master'
5050
runs-on: ubuntu-latest
5151
permissions:
5252
contents: write
53-
id-token: write
5453

5554
steps:
5655
- uses: actions/checkout@v4
@@ -62,20 +61,3 @@ jobs:
6261
baseVersion: ${{ env.BASE_VERSION }}
6362
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
6463
releasesBranch: master
65-
66-
- name: Set up Python
67-
uses: actions/setup-python@v5
68-
with:
69-
python-version: '3.11'
70-
71-
- name: Update package version
72-
run: |
73-
sed -i "s/__version__ = '.*'/__version__ = '${{ steps.vtl.outputs.ver_semVerNoMetaPyPA }}'/" diskcache/__init__.py
74-
75-
- name: Build package
76-
run: |
77-
pip install build
78-
python -m build
79-
80-
- name: Publish to PyPI
81-
uses: pypa/gh-action-pypi-publish@release/v1

README.rst

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
mapped-diskcache: Temporary Security Fork
2-
==========================================
1+
diskcache: Temporary Security Fork
2+
===================================
33

44
.. note::
55

@@ -13,6 +13,27 @@ mapped-diskcache: Temporary Security Fork
1313

1414
**Do not use this package for anything other than the CVE fix.**
1515

16+
Using this fork as a drop-in override
17+
--------------------------------------
18+
19+
Because this fork is published under the same ``diskcache`` package name, you
20+
can use it to replace the vulnerable upstream version without changing any
21+
import statements or adding it as a direct dependency.
22+
23+
**uv** (``pyproject.toml``)::
24+
25+
[tool.uv]
26+
override-dependencies = ["diskcache>=6.0.0"]
27+
28+
[[tool.uv.sources]]
29+
diskcache = { git = "https://github.com/mapped/python-diskcache", branch = "master" }
30+
31+
**pip** (``requirements.txt``)::
32+
33+
diskcache @ git+https://github.com/mapped/python-diskcache@master
34+
35+
**Poetry** — not supported. Poetry has no package-name override mechanism.
36+
1637
.. _grantjenks/python-diskcache: https://github.com/grantjenks/python-diskcache
1738
.. _PR #364: https://github.com/grantjenks/python-diskcache/pull/364
1839
.. _CVE-2025-69872: https://www.cve.org/CVERecord?id=CVE-2025-69872

diskcache/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# Django not installed or not setup so ignore.
6565
pass
6666

67-
__title__ = 'mapped-diskcache'
67+
__title__ = 'diskcache'
6868
__version__ = '6.0.0'
6969
__build__ = 0x060000
7070
__author__ = 'Grant Jenks'

0 commit comments

Comments
 (0)