Update CI/CD and support Python 3.10 + 3.11

.github/workflows/build-and-upload-to-pypi.yml

@@ -0,0 +1,72 @@
+name: Build and upload to PyPI
+
+on:
+ release:
+   types:
+     - published
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, windows-2019, macos-11]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          git submodule sync --recursive
+          git submodule update --init --force --recursive --depth=1
+
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: all
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.11.2
+        env:
+          CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux2014'
+          CIBW_ARCHS: auto64
+          CIBW_ARCHS_LINUX: auto64 aarch64
+          CIBW_BUILD: 'cp3*'
+          CIBW_SKIP: '*-musllinux_*'
+          CIBW_BEFORE_BUILD_WINDOWS: make pip
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    # upload to PyPI on every tag starting with 'v'
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@v1.5.0
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/build-darwin.yml → .github/workflows/test-darwin.yml

@@ -1,4 +1,4 @@
-name: Build for macOS
+name: Test for macOS
 
 on:
   - push
@@ -10,31 +10,36 @@ 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
-        name: Install Python 3.6
-        with:
-          python-version: "3.6"
-
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==1.6.3
+          python -m pip install cibuildwheel==2.11.2
 
       - name: Checkout submodules
         shell: bash
@@ -46,6 +51,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
@@ -58,19 +71,8 @@ jobs:
         run: |
           tox -e py37
 
-      - name: Test for Python 3.6
-        run: |
-          tox -e py36
-
       - name: Build wheel
-        if: contains(github.ref, 'tags/')
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
-
-      - uses: actions/upload-artifact@v1
-        if: contains(github.ref, 'tags/')
-        with:
-          name: wheels
-          path: ./wheelhouse
+          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-*

.github/workflows/build-linux.yml → .github/workflows/test-linux.yml

@@ -1,4 +1,4 @@
-name: Build for Linux
+name: Test for Linux
 
 on:
   - push
@@ -7,34 +7,39 @@ on:
 jobs:
   build_wheels:
     name: Build wheel on Linux
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-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
-        name: Install Python 3.6
-        with:
-          python-version: "3.6"
-
+
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==1.6.3
+          python -m pip install cibuildwheel==2.11.2
 
       - name: Checkout submodules
         shell: bash
@@ -46,6 +51,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
@@ -58,19 +71,8 @@ jobs:
         run: |
           tox -e py37
 
-      - name: Test for Python 3.6
-        run: |
-          tox -e py36
-
       - name: Build wheel
-        if: contains(github.ref, 'tags/')
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
-
-      - uses: actions/upload-artifact@v1
-        if: contains(github.ref, 'tags/')
-        with:
-          name: wheels
-          path: ./wheelhouse
+          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-*

.github/workflows/build-windows.yml → .github/workflows/test-windows.yml

@@ -1,4 +1,4 @@
-name: Build for windows
+name: Test for Windows
 
 on:
   - push
@@ -7,7 +7,7 @@ on:
 jobs:
   build_wheels:
     name: Build wheel on Windows ${{ matrix.config.arch }}
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         config:
@@ -16,35 +16,41 @@ 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
-        name: Install Python 3.6
-        with:
-          python-version: "3.6"
-          architecture: ${{ matrix.config.py-architecture }}
-
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==1.6.3
+          python -m pip install cibuildwheel==2.11.2
 
       - name: Checkout submodules
         shell: bash
@@ -56,6 +62,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: |
@@ -74,21 +92,10 @@ jobs:
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -no_logo -arch=${{ matrix.config.vs-arch }}
           tox -e py37
 
-      - name: Test for Python 3.6
-        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 py36
-
       - name: Build wheel
-        if: contains(github.ref, 'tags/')
         run: |
           python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
-
-      - uses: actions/upload-artifact@v1
-        if: contains(github.ref, 'tags/')
-        with:
-          name: wheels
-          path: ./wheelhouse
+          CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-*
+          CIBW_ARCHS: auto64
+          CIBW_BEFORE_BUILD_WINDOWS: make pip

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
@@ -17,9 +17,7 @@ install: clean
 	python setup.py install
 
 build-wheels-on-manylinux2014:
-	docker pull quay.io/pypa/manylinux2014_i686
 	docker pull quay.io/pypa/manylinux2014_x86_64
-	docker run --rm -ti -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_i686   bash dockerfiles/buildwheel.sh
 	docker run --rm -ti -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_x86_64 bash dockerfiles/buildwheel.sh
 
 build: clean pip test sdist build-wheels-on-manylinux2014

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"