Skip to content

fix(#868k5bbdr): Rename package back to diskcache for git source override #6

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.

Sign up for GitHub

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

Merged
vavsab merged 1 commit into from
Jul 7, 2026
+25 −22
Merged

fix(#868k5bbdr): Rename package back to diskcache for git source override #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ jobs:
- name: Run tests
run: tox -e py

publish:
tag:
needs: tests
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
permissions:
contents: write
id-token: write

steps:
- uses: actions/checkout@v4
Expand All @@ -62,20 +61,3 @@ jobs:
baseVersion: ${{ env.BASE_VERSION }}
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
releasesBranch: master

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Update package version
run: |
sed -i "s/__version__ = '.*'/__version__ = '${{ steps.vtl.outputs.ver_semVerNoMetaPyPA }}'/" diskcache/__init__.py

- name: Build package
run: |
pip install build
python -m build

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
25 changes: 23 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mapped-diskcache: Temporary Security Fork
==========================================
diskcache: Temporary Security Fork
===================================

.. note::

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

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

Using this fork as a drop-in override
--------------------------------------

Because this fork is published under the same ``diskcache`` package name, you
can use it to replace the vulnerable upstream version without changing any
import statements or adding it as a direct dependency.

**uv** (``pyproject.toml``)::

[tool.uv]
override-dependencies = ["diskcache>=6.0.0"]

[[tool.uv.sources]]
diskcache = { git = "https://github.com/mapped/python-diskcache", branch = "master" }

**pip** (``requirements.txt``)::

diskcache @ git+https://github.com/mapped/python-diskcache@master

**Poetry** — not supported. Poetry has no package-name override mechanism.

.. _grantjenks/python-diskcache: https://github.com/grantjenks/python-diskcache
.. _PR #364: https://github.com/grantjenks/python-diskcache/pull/364
.. _CVE-2025-69872: https://www.cve.org/CVERecord?id=CVE-2025-69872
Expand Down
2 changes: 1 addition & 1 deletion diskcache/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# Django not installed or not setup so ignore.
pass

__title__ = 'mapped-diskcache'
__title__ = 'diskcache'
__version__ = '6.0.0'
__build__ = 0x060000
__author__ = 'Grant Jenks'
Expand Down
Loading