Remove setuptools workarounds.

jendrikseipp · Jan 16, 2023 · 01523f9 · 01523f9
1 parent 2ea9d41
commit 01523f9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -51,10 +51,10 @@ jobs:
     - name: Check style
       if: matrix.os == 'ubuntu-22.04'
       run: |
-        SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m tox -v -e style
+        python3 -m tox -v -e style
 
     - name: Run tests
       run: |
         python3 -c "import gi"
-        SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m tox -v -e py
+        python3 -m tox -v -e py
         python3 -m pip install .
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # 2.29.3 (2023-01-16)
+* Make all menu items translatable (Jendrik Seipp).
 * Packaging: install translation files under <prefix>/share/locale again (#666, Jendrik Seipp).
 
 # 2.29.2 (2023-01-13)

diff --git a/appveyor.yml b/appveyor.yml
@@ -63,7 +63,6 @@ build_script:
   - move enchant C:\gtk\share
 
   # Run tests.
-  - set SETUPTOOLS_USE_DISTUTILS=stdlib
   - "%PYTHON% -m tox -v -e py"
 
   - cd win

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools==59.6.0"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 # NOTE: you have to use single-quoted strings in TOML for regular expressions.

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,6 @@
 [tox]
 envlist = py3, style
 basepython = python3
-requires =
-  setuptools==59.6.0
-  tox==3.27.1
-# Hopefully, we can get rid of this environment variable in the future.
-passenv = SETUPTOOLS_USE_DISTUTILS
 
 [testenv]
 deps =