Add Python 3.12 and PyPy 3.10 to supported versions. (#62)

* Add Python 3.12 and PyPy 3.10 to supported versions. * Use collections.abc.Hashable. * Add setuptools to tox.ini deps.
scrapy · Oct 5, 2023 · 769fe07 · 769fe07
1 parent e8b5e98
commit 769fe07
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -7,24 +7,24 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: 3
+        - python-version: 3.12
           env:
             TOXENV: black
-        - python-version: 3
+        - python-version: 3.12
           env:
             TOXENV: flake8
-        - python-version: 3
+        - python-version: 3.12
           env:
             TOXENV: pylint
-        - python-version: 3
+        - python-version: 3.12
           env:
             TOXENV: security
-        - python-version: 3
+        - python-version: 3.12
           env:
             TOXENV: typing
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - name: Set up Python 3
+    - name: Set up Python 3.12
       uses: actions/setup-python@v4
       with:
-        python-version: 3
+        python-version: 3.12
 
     - name: Publish to PyPI
       run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,12 +19,18 @@ jobs:
         - python-version: "3.11"
           env:
             TOXENV: py
+        - python-version: "3.12"
+          env:
+            TOXENV: py
         - python-version: pypy3.9
           env:
             TOXENV: pypy
+        - python-version: pypy3.10
+          env:
+            TOXENV: pypy
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

diff --git a/queuelib/rrqueue.py b/queuelib/rrqueue.py
@@ -1,5 +1,6 @@
 from collections import deque
-from typing import Any, Callable, Hashable, Iterable, List, Optional
+from collections.abc import Hashable
+from typing import Any, Callable, Iterable, List, Optional
 
 from queuelib.queue import BaseQueue
 

diff --git a/setup.py b/setup.py
@@ -22,6 +22,7 @@
         "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",
     ],

diff --git a/tox.ini b/tox.ini
@@ -10,6 +10,7 @@ envlist = py, pypy3, black, flake8, pylint, security, typing
 deps =
     pytest !=3.1.1, !=3.1.2
     pytest-cov==2.11.1
+    setuptools
 commands =
     py.test --cov=queuelib --cov-report=xml --cov-report=term --cov-report=html {posargs:queuelib}
 
@@ -25,15 +26,15 @@ commands =
 [testenv:flake8]
 basepython = python3
 deps =
-    flake8==3.9.1
+    flake8==6.1.0
 commands =
     flake8 {posargs:queuelib setup.py}
 
 [testenv:pylint]
 basepython = python3
 deps =
     {[testenv]deps}
-    pylint==2.16.0
+    pylint==3.0.0
 commands =
     pylint {posargs:queuelib setup.py}