Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Python 3.10 & 3.11 #78

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Support Python 3.10 & 3.11 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a7d4c66
Support Python 3.10
q0w Nov 17, 2021
6a45feb
Use pytest
q0w Nov 17, 2021
53d0301
Fix Makefile
q0w Nov 17, 2021
27772dd
Reformat
q0w Nov 17, 2021
ec71778
Update .github/workflows/build-linux.yml
q0w Jul 19, 2022
0d8454d
Update .github/workflows/build-windows.yml
q0w Jul 19, 2022
b530335
Update .github/workflows/build-darwin.yml
q0w Jul 19, 2022
e9ca864
Undo reformat
q0w Jul 19, 2022
79c0339
Update requirements-dev.txt
q0w Jul 19, 2022
6aae31b
Upgrade all actions
q0w Jul 19, 2022
e8426f8
Update Pipfile
q0w Jul 19, 2022
1bd2667
Add py311
q0w Oct 29, 2022
3389883
Bump cython
q0w Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions .github/workflows/build-darwin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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/')
Expand Down
30 changes: 24 additions & 6 deletions .github/workflows/build-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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/')
Expand Down
36 changes: 30 additions & 6 deletions .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: |
Expand Down Expand Up @@ -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/')
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading