diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0433ee9..95bdca3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,7 +102,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-rc.1" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -178,15 +178,7 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel - - name: Install zope.i18nmessageid and dependencies (3.12.0-rc.1) - if: matrix.python-version == '3.12.0-rc.1' - run: | - # Install to collect dependencies into the (pip) cache. - # Use "--pre" here because dependencies with support for this future - # Python release may only be available as pre-releases - pip install --pre .[test] - name: Install zope.i18nmessageid and dependencies - if: matrix.python-version != '3.12.0-rc.1' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -230,7 +222,6 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') - && !startsWith(matrix.python-version, '3.12.0-rc.1') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -249,7 +240,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-rc.1" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -286,22 +277,7 @@ jobs: with: name: zope.i18nmessageid-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install zope.i18nmessageid 3.12.0-rc.1 - if: ${{ startsWith(matrix.python-version, '3.12.0-rc.1') }} - run: | - pip install -U wheel setuptools - # coverage has a wheel on PyPI for a future python version which is - # not ABI compatible with the current one, so build it from sdist: - pip install -U --no-binary :all: coverage - # Unzip into src/ so that testrunner can find the .so files - # when we ask it to load tests from that directory. This - # might also save some build time? - unzip -n dist/zope.i18nmessageid-*whl -d src - # Use "--pre" here because dependencies with support for this future - # Python release may only be available as pre-releases - pip install --pre -U -e .[test] - name: Install zope.i18nmessageid - if: ${{ !startsWith(matrix.python-version, '3.12.0-rc.1') }} run: | pip install -U wheel setuptools pip install -U coverage diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 544f6a3..69f8c66 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,12 +28,12 @@ yum -y install libffi-devel tox_env_map() { case $1 in - *"cp312"*) echo 'py312';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; *"cp311"*) echo 'py311';; + *"cp312"*) echo 'py312';; *) echo 'py';; esac } @@ -41,19 +41,14 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ - [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp311"* ]] || \ + [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp37"* ]] || \ [[ "${PYBIN}" == *"cp38"* ]] || \ [[ "${PYBIN}" == *"cp39"* ]] || \ [[ "${PYBIN}" == *"cp310"* ]] ; then - if [[ "${PYBIN}" == *"cp312"* ]] ; then - "${PYBIN}/pip" install --pre -e /io/ - "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/ - else - "${PYBIN}/pip" install -e /io/ - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ - fi + "${PYBIN}/pip" install -e /io/ + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ if [ `uname -m` == 'aarch64' ]; then cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index 3c7c219..e33151f 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "28abbfda" +commit-id = "a361e1fd" [python] with-appveyor = true @@ -15,6 +15,9 @@ with-macos = false [tox] use-flake8 = true +testenv-deps = [ + "py37: urllib3 < 2", + ] [coverage] fail-under = 100 @@ -28,6 +31,7 @@ additional-config = [ [manifest] additional-rules = [ + "include *.yaml", "include *.sh", "recursive-include docs *.bat", ] diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..e30cda5 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,25 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/requirements.txt + - method: pip + path: . diff --git a/CHANGES.rst b/CHANGES.rst index e0e24bb..da031ff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,10 +2,10 @@ Changes ========= -6.0.2 (unreleased) +6.1.0 (unreleased) ================== -- Add preliminary support for Python 3.12rc1. +- Add support for Python 3.12. 6.0.1 (2023-03-24) diff --git a/MANIFEST.in b/MANIFEST.in index 079346c..a86c4ea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,5 +14,6 @@ recursive-include docs *.txt recursive-include docs Makefile recursive-include src *.py +include *.yaml include *.sh recursive-include docs *.bat diff --git a/appveyor.yml b/appveyor.yml index b209c91..defc23c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,7 @@ environment: - python: 39-x64 - python: 310-x64 - python: 311-x64 - # `multibuild` cannot install non-final versions as they are not on - # ftp.python.org, so we skip Python 3.11 until its final release: - # - python: 312-x64 + - python: 312-x64 install: - "SET PYTHONVERSION=%PYTHON%" diff --git a/docs/conf.py b/docs/conf.py index 4e21d2d..c399349 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -91,7 +91,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..94703ac --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,3 @@ +Sphinx +sphinx_rtd_theme>1 +docutils<0.19 diff --git a/setup.py b/setup.py index 190794c..bc28647 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,7 @@ def _unavailable(self, e): setup( name='zope.i18nmessageid', - version='6.0.2.dev0', + version='6.1.0.dev0', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', description='Message Identifiers for internationalization', @@ -117,6 +117,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', @@ -140,6 +141,6 @@ def _unavailable(self, e): extras_require={ 'testing': tests_require, 'test': tests_require, - 'docs': ['Sphinx'], + 'docs': ['Sphinx', 'sphinx_rtd_theme'], }, ) diff --git a/tox.ini b/tox.ini index 06a32f3..677f812 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,8 @@ envlist = [testenv] usedevelop = true -pip_pre = py312: true deps = - Sphinx + py37: urllib3 < 2 setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0 @@ -37,6 +36,7 @@ allowlist_externals = mkdir deps = coverage + py37: urllib3 < 2 setenv = PURE_PYTHON=1 commands =