diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a12223..cb8fc40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -128,7 +128,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -291,7 +291,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -386,7 +386,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -437,7 +437,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -490,7 +490,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }} diff --git a/.meta.toml b/.meta.toml index 500ad3d..87a8416 100644 --- a/.meta.toml +++ b/.meta.toml @@ -10,7 +10,7 @@ with-windows = false with-pypy = true with-docs = true with-sphinx-doctests = true -with-future-python = true +with-future-python = false with-macos = false [tox] diff --git a/CHANGES.rst b/CHANGES.rst index e4cbe65..7336af3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 6.1 (unreleased) ================ -- Add preliminary support for Python 3.12b4. +- Add support for Python 3.12. - Add preliminary support for Python 3.13 as of 3.13a3. diff --git a/setup.py b/setup.py index 5a1e939..48b474c 100644 --- a/setup.py +++ b/setup.py @@ -92,6 +92,7 @@ def _unavailable(self, e): 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Natural Language :: English', diff --git a/src/zope/index/text/okapiindex.py b/src/zope/index/text/okapiindex.py index a79e51f..229cb55 100644 --- a/src/zope/index/text/okapiindex.py +++ b/src/zope/index/text/okapiindex.py @@ -200,7 +200,7 @@ _py_impl = getattr(platform, 'python_implementation', lambda: None) _is_pypy = _py_impl() == 'PyPy' -PURE_PYTHON = os.environ.get('PURE_PYTHON') or _is_pypy +PURE_PYTHON = int(os.environ.get('PURE_PYTHON', '0')) or _is_pypy try: from zope.index.text.okascore import score except ImportError: # pragma: no cover