- prepare release 4.11.2, package cleanups

.github/workflows/tests.yml

@@ -173,10 +173,6 @@ jobs:
           # output (pip install uses a random temporary directory, making this difficult).
           python setup.py build_ext -i
           python setup.py bdist_wheel
-          # Also install it, so that we get dependencies in the (pip) cache.
-          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
-          pip install .[test]
-
       - name: Build BTrees (macOS arm64, Python 3.8+)
         if: >
           startsWith(runner.os, 'Mac')
@@ -194,10 +190,23 @@ jobs:
           # output (pip install uses a random temporary directory, making this difficult).
           python setup.py build_ext -i
           python setup.py bdist_wheel
-          # Also install it, so that we get dependencies in the (pip) cache.
-          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
-          pip install .[test]
-
+      - name: Build BTrees (macOS universal2, Python 3.8+)
+        if: >
+          startsWith(runner.os, 'Mac')
+          && !(startsWith(matrix.python-version, 'pypy')
+               || matrix.python-version == '2.7'
+               || matrix.python-version == '3.5'
+               || matrix.python-version == '3.6'
+               || matrix.python-version == '3.7')
+        env:
+          MACOSX_DEPLOYMENT_TARGET: 10.9
+          _PYTHON_HOST_PLATFORM: macosx-10.9-universal2
+          ARCHFLAGS: -arch arm64 -arch x86_64
+        run: |
+          # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
+          # output (pip install uses a random temporary directory, making this difficult).
+          python setup.py build_ext -i
+          python setup.py bdist_wheel
       - name: Build BTrees (all other versions)
         if: >
           !startsWith(runner.os, 'Mac')
@@ -211,7 +220,10 @@ jobs:
           # output (pip install uses a random temporary directory, making this difficult).
           python setup.py build_ext -i
           python setup.py bdist_wheel
-          # Also install it, so that we get dependencies in the (pip) cache.
+
+      - name: Install BTrees and dependencies
+        run: |
+          # Install to collect dependencies into the (pip) cache.
           pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
           pip install .[test]
 
@@ -241,6 +253,20 @@ jobs:
           # on the GHA runner, which uses x86_64 architecture.
           name: BTrees-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl
           path: dist/*arm64.whl
+      - name: Upload BTrees wheel (macOS universal2)
+        if: >
+          startsWith(runner.os, 'Mac')
+          && !(startsWith(matrix.python-version, 'pypy')
+               || matrix.python-version == '2.7'
+               || matrix.python-version == '3.5'
+               || matrix.python-version == '3.6'
+               || matrix.python-version == '3.7')
+        uses: actions/upload-artifact@v3
+        with:
+          # The universal2 wheel is uploaded with a different name just so it
+          # can be manually downloaded when desired.
+          name: BTrees-${{ runner.os }}-${{ matrix.python-version }}-universal2.whl
+          path: dist/*universal2.whl
       - name: Upload BTrees wheel (all other platforms)
         if: >
           !startsWith(runner.os, 'Mac')
@@ -324,6 +350,7 @@ jobs:
           pip install -U wheel setuptools
           pip install -U coverage
           pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
+          pip install -U 'cffi; platform_python_implementation == "CPython"'
           # 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?

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "2c296e2bbbe586543954e2607dff51264d676f4a"
+commit-id = "342271a70d886e753e5cc629e8a81b3cfab692ac"
 
 [python]
 with-appveyor = true
@@ -12,6 +12,7 @@ with-future-python = false
 with-legacy-python = true
 with-docs = true
 with-sphinx-doctests = true
+with-macos = false
 
 [tox]
 use-flake8 = false

CHANGES.rst

@@ -2,7 +2,7 @@
  BTrees Changelog
 ==================
 
-4.11.2 (unreleased)
+4.11.2 (2022-11-16)
 ===================
 
 - Add support for building arm64 wheels on macOS.

README.rst

@@ -1,6 +1,6 @@
-=========================================
- BTrees:  scalable persistent components
-=========================================
+=============================================
+ ``BTrees``:  scalable persistent components
+=============================================
 
 .. image:: https://github.com/zopefoundation/BTrees/actions/workflows/tests.yml/badge.svg
     :target: https://github.com/zopefoundation/BTrees/actions/workflows/tests.yml
@@ -11,6 +11,10 @@
 .. image:: https://coveralls.io/repos/github/zopefoundation/BTrees/badge.svg?branch=master
     :target: https://coveralls.io/github/zopefoundation/BTrees?branch=master
 
+.. image:: https://readthedocs.org/projects/btrees/badge/?version=latest
+        :target: https://btrees.readthedocs.io/en/latest/
+        :alt: Documentation Status
+
 .. image:: https://img.shields.io/pypi/v/BTrees.svg
         :target: https://pypi.org/project/BTrees/
         :alt: Current version on PyPI
@@ -25,5 +29,5 @@ a modified BTree data structure.  The trees are optimized for use inside
 ZODB's "optimistic concurrency" paradigm, and include explicit resolution
 of conflicts detected by that mechanism.
 
-Please see `the Sphinx documentation <http://btrees.readthedocs.io/>`_ for further
-information.
+Please see `the Sphinx documentation <https://btrees.readthedocs.io/>`_ for
+further information.

docs/conf.py

@@ -276,6 +276,6 @@
 intersphinx_mapping = {
     'https://docs.python.org/3/': None,
     'https://persistent.readthedocs.io/en/latest/': None,
-    "https://zodb.readthedocs.io/en/latest/": None,
+    "https://zodb.org/en/latest/": None,
     "https://zopeinterface.readthedocs.io/en/latest/": None,
 }

setup.py

@@ -25,7 +25,7 @@
 from setuptools import setup
 from setuptools.command.build_ext import build_ext
 
-version = '4.11.2.dev0'
+version = '4.11.2'
 
 def _read(fname):
     here = os.path.abspath(os.path.dirname(__file__))
@@ -210,6 +210,11 @@ def BTreeExtension(family):
       author="Zope Foundation",
       author_email="zodb-dev@zope.org",
       url="https://github.com/zopefoundation/BTrees",
+      project_urls={
+        'Documentation': 'https://btrees.readthedocs.io',
+        'Issue Tracker': 'https://github.com/zopefoundation/BTrees/issues',
+        'Sources': 'https://github.com/zopefoundation/BTrees',
+      },
       license="ZPL 2.1",
       platforms=["any"],
       packages=find_packages('src'),
@@ -231,6 +236,7 @@ def BTreeExtension(family):
       },
       test_suite="BTrees.tests",
       tests_require=TESTS_REQUIRE,
+      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
       install_requires=REQUIRES,
       cmdclass={
           'build_ext': optional_build_ext,