Support Python 3.10 & 3.11

.github/workflows/build-darwin.yml

@@ -10,24 +10,34 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
+        name: Install Python 3.11
+        with:
+          python-version: "3.11"
+
+      - uses: actions/setup-python@v4
+        name: Install Python 3.10
+        with:
+          python-version: "3.10"
+
+      - uses: actions/setup-python@v4
         name: Install Python 3.9
         with:
           python-version: "3.9"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.8
         with:
           python-version: "3.8"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.7
         with:
           python-version: "3.7"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.6
         with:
           python-version: "3.6"
@@ -46,6 +56,14 @@ jobs:
         run: |
           pip install -r requirements-dev.txt
 
+      - name: Test for Python 3.11
+        run: |
+          tox -e py311
+
+      - name: Test for Python 3.10
+        run: |
+          tox -e py310
+
       - name: Test for Python 3.9
         run: |
           tox -e py39
@@ -67,7 +85,7 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
+          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-*
 
       - uses: actions/upload-artifact@v1
         if: contains(github.ref, 'tags/')

.github/workflows/build-linux.yml

@@ -10,24 +10,34 @@ jobs:
     runs-on: ubuntu-18.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
+        name: Install Python 3.11
+        with:
+          python-version: "3.11"
+
+      - uses: actions/setup-python@v4
+        name: Install Python 3.10
+        with:
+          python-version: "3.10"
+
+      - uses: actions/setup-python@v4
         name: Install Python 3.9
         with:
           python-version: "3.9"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.8
         with:
           python-version: "3.8"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.7
         with:
           python-version: "3.7"
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.6
         with:
           python-version: "3.6"
@@ -46,6 +56,14 @@ jobs:
         run: |
           pip install -r requirements-dev.txt
 
+      - name: Test for Python 3.11
+        run: |
+          tox -e py311
+
+      - name: Test for Python 3.10
+        run: |
+          tox -e py310
+
       - name: Test for Python 3.9
         run: |
           tox -e py39
@@ -67,7 +85,7 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
+          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-*
 
       - uses: actions/upload-artifact@v1
         if: contains(github.ref, 'tags/')

.github/workflows/build-windows.yml

@@ -16,27 +16,39 @@ jobs:
             py-architecture: x64
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
+        name: Install Python 3.11
+        with:
+          python-version: "3.11"
+          architecture: ${{ matrix.config.py-architecture }}
+
+      - uses: actions/setup-python@v4
+        name: Install Python 3.10
+        with:
+          python-version: "3.10"
+          architecture: ${{ matrix.config.py-architecture }} 
+
+      - uses: actions/setup-python@v4
         name: Install Python 3.9
         with:
           python-version: "3.9"
           architecture: ${{ matrix.config.py-architecture }}
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.8
         with:
           python-version: "3.8"
           architecture: ${{ matrix.config.py-architecture }}
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.7
         with:
           python-version: "3.7"
           architecture: ${{ matrix.config.py-architecture }}
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         name: Install Python 3.6
         with:
           python-version: "3.6"
@@ -56,6 +68,18 @@ jobs:
         run: |
           pip install -r requirements-dev.txt
 
+      - name: Test for Python 3.11
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -no_logo -arch=${{ matrix.config.vs-arch }}
+          tox -e py311
+
+      - name: Test for Python 3.10
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -no_logo -arch=${{ matrix.config.vs-arch }}
+          tox -e py310
+
       - name: Test for Python 3.9
         shell: cmd
         run: |
@@ -85,7 +109,7 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
+          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-*
 
       - uses: actions/upload-artifact@v1
         if: contains(github.ref, 'tags/')

Makefile

@@ -1,5 +1,5 @@
 test:
-	python setup.py nosetests
+	python -m pytest
 
 clean:
 	$(RM) -r build dist src/cchardet/__pycache__ src/cchardet/*.cpp src/cchardet/*.pyc src/cchardet/*.so src/cchardet.egg-info src/tests/__pycache__ src/tests/*.pyc

Pipfile

@@ -7,7 +7,7 @@ verify_ssl = true
 chardet = "==3.0.4"
 nose = "==1.3.7"
 tox = "==3.20.1"
-Cython = "==0.29.21"
+Cython = "==0.29.32"
 pylint = "==2.6.0"
 wheel = "==0.35.1"
 twine = "==3.2.0"