diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79c75a4..3ab0525 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/README.rst b/README.rst index 56e3add..50c2101 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -mapped-diskcache: Temporary Security Fork -========================================== +diskcache: Temporary Security Fork +=================================== .. note:: @@ -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 diff --git a/diskcache/__init__.py b/diskcache/__init__.py index 38096e2..a7e451d 100644 --- a/diskcache/__init__.py +++ b/diskcache/__init__.py @@ -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'