Merge branch 'master' into add_test_for_except_star

zopefoundation · Nov 2, 2022 · d7fc20c · d7fc20c
2 parents d0b2b7f + eed9d9d
commit d7fc20c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.meta.toml b/.meta.toml
@@ -2,15 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "b5df3766ff8923477f3d24729b19504f0c401a2e"
+commit-id = "70229255d495a945324228b50ee735cc75e01430"
 
 [python]
 with-pypy = false
 with-legacy-python = false
 with-docs = true
 with-sphinx-doctests = true
 with-windows = true
-with-future-python = true
+with-future-python = false
 
 [tox]
 use-flake8 = true

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,12 +12,7 @@ Backwards incompatible changes
 Features
 ++++++++
 
-- Allow to use the package with Python 3.11 -- Caution: No security audit has
-  been done so far.
-
-- Fix code to run on Python 3.11.0rc2.
-
-- Add test for trystar syntax.
+- Officially support Python 3.11.
 
 
 5.2 (2021-11-19)

diff --git a/setup.py b/setup.py
@@ -47,7 +47,6 @@ def read(*rnames):
         'Programming Language :: Python',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',

diff --git a/tox.ini b/tox.ini
@@ -17,12 +17,10 @@ envlist =
 
 [testenv]
 usedevelop = true
-pip_pre = py311: true
 deps =
     datetime: DateTime
     -cconstraints.txt
     pytest-cov
-    Sphinx
 setenv =
     COVERAGE_FILE=.coverage.{envname}
 commands =
@@ -91,7 +89,6 @@ deps =
     datetime: DateTime
     -cconstraints.txt
     pytest-cov
-    Sphinx
 setenv =
     COVERAGE_FILE=.coverage
 commands =