From a38a735a76135e97df64715288424e315dd42a26 Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:15:39 -0500 Subject: [PATCH 1/9] update cibuildwheel to actually build properly --- .github/workflows/build-darwin.yml | 2 +- .github/workflows/build-linux.yml | 4 ++-- .github/workflows/build-windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/build-darwin.yml index 80cdbbe..e70eb11 100644 --- a/.github/workflows/build-darwin.yml +++ b/.github/workflows/build-darwin.yml @@ -44,7 +44,7 @@ jobs: - 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 diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 70991f7..fc576d9 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -7,7 +7,7 @@ on: jobs: build_wheels: name: Build wheel on Linux - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -111,7 +111,7 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel~=1.8.0 + python -m pip install cibuildwheel~=2.11.2 - uses: docker/setup-qemu-action@v1 name: Set up QEMU diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index fc1e570..0e3ea9e 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -56,7 +56,7 @@ jobs: - 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 From 83b680ef51c652b49609739521c194c359b63a57 Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:19:01 -0500 Subject: [PATCH 2/9] how many times do i gotta fix this --- .github/workflows/build-darwin.yml | 10 +++++----- .github/workflows/build-linux.yml | 16 ++++++++-------- .github/workflows/build-windows.yml | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/build-darwin.yml index e70eb11..b999d50 100644 --- a/.github/workflows/build-darwin.yml +++ b/.github/workflows/build-darwin.yml @@ -12,11 +12,6 @@ jobs: steps: - uses: actions/checkout@v3 - - 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: @@ -42,6 +37,11 @@ jobs: with: python-version: "3.6" + - uses: actions/setup-python@v4 + name: Install Python 3.11 + with: + python-version: "3.11" + - name: Install cibuildwheel run: | python -m pip install cibuildwheel==2.11.2 diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index fc576d9..bf21b70 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -12,11 +12,6 @@ jobs: steps: - uses: actions/checkout@v3 - - 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: @@ -42,9 +37,14 @@ jobs: with: python-version: "3.6" + - uses: actions/setup-python@v4 + name: Install Python 3.11 + with: + python-version: "3.11" + - 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 @@ -105,9 +105,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 - name: Install Python 3.8 + name: Install Python 3.11 with: - python-version: "3.8" + python-version: "3.11" - name: Install cibuildwheel run: | diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 0e3ea9e..6b200a5 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -18,12 +18,6 @@ jobs: steps: - uses: actions/checkout@v3 - - 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: @@ -54,6 +48,12 @@ jobs: python-version: "3.6" architecture: ${{ matrix.config.py-architecture }} + - uses: actions/setup-python@v4 + name: Install Python 3.11 + with: + python-version: "3.11" + architecture: ${{ matrix.config.py-architecture }} + - name: Install cibuildwheel run: | python -m pip install cibuildwheel==2.11.2 From 1eb1dd0498da22a8bf22bc7675c2777951211140 Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:33:45 -0500 Subject: [PATCH 3/9] fix up workflows and create new one for building and uploading --- .../workflows/build-and-upload-to-pypi.yml | 66 +++++++ .github/workflows/build-linux.yml | 161 ------------------ .../{build-darwin.yml => test-darwin.yml} | 24 --- .github/workflows/test-linux.yml | 87 ++++++++++ .../{build-windows.yml => test-windows.yml} | 24 --- src/cchardet/version.py | 2 +- 6 files changed, 154 insertions(+), 210 deletions(-) create mode 100644 .github/workflows/build-and-upload-to-pypi.yml delete mode 100644 .github/workflows/build-linux.yml rename .github/workflows/{build-darwin.yml => test-darwin.yml} (74%) create mode 100644 .github/workflows/test-linux.yml rename .github/workflows/{build-windows.yml => test-windows.yml} (83%) diff --git a/.github/workflows/build-and-upload-to-pypi.yml b/.github/workflows/build-and-upload-to-pypi.yml new file mode 100644 index 0000000..4e96401 --- /dev/null +++ b/.github/workflows/build-and-upload-to-pypi.yml @@ -0,0 +1,66 @@ +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: + # Windows builds currently broken + #os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, 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: Build wheels + uses: pypa/cibuildwheel@v2.11.2 + env: + CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux2014' + CIBW_ARCHS: auto64 + CIBW_BUILD: 'cp3*' + CIBW_SKIP: '*-musllinux_*' + + - 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 }} \ No newline at end of file diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml deleted file mode 100644 index bf21b70..0000000 --- a/.github/workflows/build-linux.yml +++ /dev/null @@ -1,161 +0,0 @@ -name: Build for Linux - -on: - - push - - pull_request - -jobs: - build_wheels: - name: Build wheel on Linux - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - 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@v4 - name: Install Python 3.8 - with: - python-version: "3.8" - - - uses: actions/setup-python@v4 - name: Install Python 3.7 - with: - python-version: "3.7" - - - uses: actions/setup-python@v4 - name: Install Python 3.6 - with: - python-version: "3.6" - - - uses: actions/setup-python@v4 - name: Install Python 3.11 - with: - python-version: "3.11" - - - name: Install cibuildwheel - run: | - python -m pip install cibuildwheel==2.11.2 - - - name: Checkout submodules - shell: bash - run: | - git submodule sync --recursive - git submodule update --init --force --recursive --depth=1 - - - name: Install dependencies - 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 - - - name: Test for Python 3.8 - run: | - tox -e py38 - - - name: Test for Python 3.7 - 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-* cp310-* cp311-* - - - uses: actions/upload-artifact@v1 - if: contains(github.ref, 'tags/') - with: - name: wheels - path: ./wheelhouse - - build_wheels_aarch64: - name: Build wheels on ${{ matrix.os }}, ${{ matrix.arch }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - arch: [aarch64] - - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v1 - name: Install Python 3.11 - with: - python-version: "3.11" - - - name: Install cibuildwheel - run: | - python -m pip install cibuildwheel~=2.11.2 - - - uses: docker/setup-qemu-action@v1 - name: Set up QEMU - - - name: Checkout submodules - shell: bash - run: | - git submodule sync --recursive - git submodule update --init --force --recursive --depth=1 - - - name: Build wheel - if: contains(github.ref, 'tags/') - run: | - python -m cibuildwheel --output-dir wheelhouse - env: - CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* - CIBW_ARCHS_LINUX: ${{ matrix.arch }} - CIBW_BEFORE_BUILD: python -m pip install --upgrade pip - && python -m pip install tox - CIBW_TEST_REQUIRES: tox - CIBW_TEST_COMMAND: cd /project - && python -m pip install -r requirements-dev.txt - && /opt/python/*/bin/tox -e py - - - uses: actions/upload-artifact@v1 - if: contains(github.ref, 'tags/') - with: - name: wheels - path: ./wheelhouse - - upload_pypi: - name: 'Upload packages' - needs: ['build_wheels', 'build_wheels_aarch64'] - runs-on: 'ubuntu-latest' - if: github.event_name == 'release' && github.event.action == 'created' - steps: - - uses: actions/download-artifact@v2 - name: 'Download artifacts' - with: - name: 'artifact' - path: 'dist' - - - uses: pypa/gh-action-pypi-publish@release/v1 - name: "Publish package to PyPI" - with: - user: '__token__' - password: '${{ secrets.PYPI_API_TOKEN }}' diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/test-darwin.yml similarity index 74% rename from .github/workflows/build-darwin.yml rename to .github/workflows/test-darwin.yml index b999d50..91b9464 100644 --- a/.github/workflows/build-darwin.yml +++ b/.github/workflows/test-darwin.yml @@ -86,27 +86,3 @@ jobs: python -m cibuildwheel --output-dir wheelhouse env: CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* - - - uses: actions/upload-artifact@v1 - if: contains(github.ref, 'tags/') - with: - name: wheels - path: ./wheelhouse - - upload_pypi: - name: 'Upload packages' - needs: ['build_wheels'] - runs-on: 'ubuntu-latest' - if: github.event_name == 'release' && github.event.action == 'created' - steps: - - uses: actions/download-artifact@v2 - name: 'Download artifacts' - with: - name: 'artifact' - path: 'dist' - - - uses: pypa/gh-action-pypi-publish@release/v1 - name: "Publish package to PyPI" - with: - user: '__token__' - password: '${{ secrets.PYPI_API_TOKEN }}' diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml new file mode 100644 index 0000000..6d393cb --- /dev/null +++ b/.github/workflows/test-linux.yml @@ -0,0 +1,87 @@ +name: Build for Linux + +on: + - push + - pull_request + +jobs: + build_wheels: + name: Build wheel on Linux + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - 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@v4 + name: Install Python 3.8 + with: + python-version: "3.8" + + - uses: actions/setup-python@v4 + name: Install Python 3.7 + with: + python-version: "3.7" + + - uses: actions/setup-python@v4 + name: Install Python 3.6 + with: + python-version: "3.6" + + - uses: actions/setup-python@v4 + name: Install Python 3.11 + with: + python-version: "3.11" + + - name: Install cibuildwheel + run: | + python -m pip install cibuildwheel==2.11.2 + + - name: Checkout submodules + shell: bash + run: | + git submodule sync --recursive + git submodule update --init --force --recursive --depth=1 + + - name: Install dependencies + 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 + + - name: Test for Python 3.8 + run: | + tox -e py38 + + - name: Test for Python 3.7 + run: | + tox -e py37 + + - name: Test for Python 3.6 + run: | + tox -e py36` + + - name: Build wheel + run: | + python -m cibuildwheel --output-dir wheelhouse + env: + CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* diff --git a/.github/workflows/build-windows.yml b/.github/workflows/test-windows.yml similarity index 83% rename from .github/workflows/build-windows.yml rename to .github/workflows/test-windows.yml index 6b200a5..23141b6 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/test-windows.yml @@ -111,27 +111,3 @@ jobs: env: CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* - - uses: actions/upload-artifact@v1 - if: contains(github.ref, 'tags/') - with: - name: wheels - path: ./wheelhouse - - upload_pypi: - name: 'Upload packages' - needs: ['build_wheels'] - runs-on: 'ubuntu-latest' - if: github.event_name == 'release' && github.event.action == 'created' - steps: - - uses: actions/download-artifact@v2 - name: 'Download artifacts' - with: - name: 'artifact' - path: 'dist' - - - uses: pypa/gh-action-pypi-publish@release/v1 - name: "Publish package to PyPI" - with: - user: '__token__' - password: '${{ secrets.PYPI_API_TOKEN }}' - diff --git a/src/cchardet/version.py b/src/cchardet/version.py index d3a156b..17ff61b 100644 --- a/src/cchardet/version.py +++ b/src/cchardet/version.py @@ -1 +1 @@ -__version__ = '2.1.9' +__version__ = '2.1.10rc0' From d76415ed7b44fa505007d560ec75728e7c42c45b Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:34:51 -0500 Subject: [PATCH 4/9] fix project url --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8d6c2f1..bb49a2e 100644 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ def read(f): name='faust-cchardet', author='PyYoshi', author_email='myoshi321go@gmail.com', - url=r'https://github.com/PyYoshi/cChardet', + url=r'https://github.com/faust-streaming/cChardet', description='cChardet is high speed universal character encoding detector.', long_description='\n\n'.join((read('README.rst'), read('CHANGES.rst'))), version=version, From 2fe49d49251d8555ef33bc233577de4d2ebcce9d Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:39:34 -0500 Subject: [PATCH 5/9] this project is definitely cursed --- .github/workflows/test-darwin.yml | 13 ++++++------- .github/workflows/test-linux.yml | 14 +++++--------- .github/workflows/test-windows.yml | 15 +++++++-------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test-darwin.yml b/.github/workflows/test-darwin.yml index 91b9464..af30d33 100644 --- a/.github/workflows/test-darwin.yml +++ b/.github/workflows/test-darwin.yml @@ -12,6 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 + - 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: @@ -37,14 +42,9 @@ jobs: with: python-version: "3.6" - - uses: actions/setup-python@v4 - name: Install Python 3.11 - with: - python-version: "3.11" - - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==2.11.2 + python -m pip install cibuildwheel==1.6.3 - name: Checkout submodules shell: bash @@ -81,7 +81,6 @@ jobs: tox -e py36 - name: Build wheel - if: contains(github.ref, 'tags/') run: | python -m cibuildwheel --output-dir wheelhouse env: diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 6d393cb..e9e0db2 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -12,6 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 + - 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: @@ -37,15 +42,6 @@ jobs: with: python-version: "3.6" - - uses: actions/setup-python@v4 - name: Install Python 3.11 - with: - python-version: "3.11" - - - name: Install cibuildwheel - run: | - python -m pip install cibuildwheel==2.11.2 - - name: Checkout submodules shell: bash run: | diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 23141b6..cf3f2cf 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -18,6 +18,12 @@ jobs: steps: - uses: actions/checkout@v3 + - 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: @@ -48,15 +54,9 @@ jobs: python-version: "3.6" architecture: ${{ matrix.config.py-architecture }} - - uses: actions/setup-python@v4 - name: Install Python 3.11 - with: - python-version: "3.11" - architecture: ${{ matrix.config.py-architecture }} - - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==2.11.2 + python -m pip install cibuildwheel==1.6.3 - name: Checkout submodules shell: bash @@ -105,7 +105,6 @@ jobs: tox -e py36 - name: Build wheel - if: contains(github.ref, 'tags/') run: | python -m cibuildwheel --output-dir wheelhouse env: From cd6896224fdf06c3da1ac56430e09bdc1e725069 Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:43:14 -0500 Subject: [PATCH 6/9] end py3.6 support --- .github/workflows/test-darwin.yml | 13 ++----------- .github/workflows/test-linux.yml | 13 ++----------- .github/workflows/test-windows.yml | 10 ++-------- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.github/workflows/test-darwin.yml b/.github/workflows/test-darwin.yml index af30d33..960cdba 100644 --- a/.github/workflows/test-darwin.yml +++ b/.github/workflows/test-darwin.yml @@ -1,4 +1,4 @@ -name: Build for macOS +name: Test for macOS on: - push @@ -37,11 +37,6 @@ jobs: with: python-version: "3.7" - - uses: actions/setup-python@v4 - name: Install Python 3.6 - with: - python-version: "3.6" - - name: Install cibuildwheel run: | python -m pip install cibuildwheel==1.6.3 @@ -76,12 +71,8 @@ jobs: run: | tox -e py37 - - name: Test for Python 3.6 - run: | - tox -e py36 - - name: Build wheel run: | python -m cibuildwheel --output-dir wheelhouse env: - CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* + CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index e9e0db2..340d476 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -1,4 +1,4 @@ -name: Build for Linux +name: Test for Linux on: - push @@ -37,11 +37,6 @@ jobs: with: python-version: "3.7" - - uses: actions/setup-python@v4 - name: Install Python 3.6 - with: - python-version: "3.6" - - name: Checkout submodules shell: bash run: | @@ -72,12 +67,8 @@ jobs: run: | tox -e py37 - - name: Test for Python 3.6 - run: | - tox -e py36` - - name: Build wheel run: | python -m cibuildwheel --output-dir wheelhouse env: - CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* + CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index cf3f2cf..af4d60d 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -1,4 +1,4 @@ -name: Build for windows +name: Test for Windows on: - push @@ -98,15 +98,9 @@ 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 run: | python -m cibuildwheel --output-dir wheelhouse env: - CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* + CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* From 72d240dec7bee46b19c3243f9d24e8318217c81a Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 15:55:29 -0500 Subject: [PATCH 7/9] install proper cibuildwheel versions --- .github/workflows/test-darwin.yml | 2 +- .github/workflows/test-linux.yml | 4 ++++ .github/workflows/test-windows.yml | 8 +------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-darwin.yml b/.github/workflows/test-darwin.yml index 960cdba..5c771a1 100644 --- a/.github/workflows/test-darwin.yml +++ b/.github/workflows/test-darwin.yml @@ -39,7 +39,7 @@ jobs: - 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 diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 340d476..c1e8edd 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -36,6 +36,10 @@ jobs: name: Install Python 3.7 with: python-version: "3.7" + + - name: Install cibuildwheel + run: | + python -m pip install cibuildwheel==2.11.2 - name: Checkout submodules shell: bash diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index af4d60d..bb2b1e3 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -48,15 +48,9 @@ jobs: python-version: "3.7" architecture: ${{ matrix.config.py-architecture }} - - uses: actions/setup-python@v4 - 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 From 3a1c1ce1ef1e4db35f08f4733c81ff1e573f4c44 Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 16:10:59 -0500 Subject: [PATCH 8/9] only build for 64 bit windows --- .github/workflows/test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index bb2b1e3..762fdae 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -97,4 +97,4 @@ jobs: python -m cibuildwheel --output-dir wheelhouse env: CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* - + CIBW_ARCHS: auto64 From ad34d746921ca361c70fef16e6e5e771ae140fbf Mon Sep 17 00:00:00 2001 From: William Barnhart Date: Mon, 28 Nov 2022 16:16:23 -0500 Subject: [PATCH 9/9] remove rc0 --- src/cchardet/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cchardet/version.py b/src/cchardet/version.py index 17ff61b..3087de1 100644 --- a/src/cchardet/version.py +++ b/src/cchardet/version.py @@ -1 +1 @@ -__version__ = '2.1.10rc0' +__version__ = '2.1.10'