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.

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

Support Python 3.9 #65

Merged
merged 1 commit into from
Oct 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .github/workflows/build-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2
name: Install Python 3.9
with:
python-version: "3.9"

- uses: actions/setup-python@v1
name: Install Python 3.8
with:
Expand Down Expand Up @@ -46,6 +51,10 @@ jobs:
run: |
pip install -r requirements-dev.txt

- name: Test for Python 3.9
run: |
tox -e py39

- name: Test for Python 3.8
run: |
tox -e py38
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2
name: Install Python 3.9
with:
python-version: "3.9"

- uses: actions/setup-python@v1
name: Install Python 3.8
with:
Expand Down Expand Up @@ -46,6 +51,10 @@ jobs:
run: |
pip install -r requirements-dev.txt

- name: Test for Python 3.9
run: |
tox -e py39

- name: Test for Python 3.8
run: |
tox -e py38
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2
name: Install Python 3.9
with:
python-version: "3.9"
architecture: ${{ matrix.config.py-architecture }}

- uses: actions/setup-python@v1
name: Install Python 3.8
with:
Expand Down Expand Up @@ -56,6 +62,12 @@ jobs:
run: |
pip install -r requirements-dev.txt

- name: Test for Python 3.9
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 py39

- name: Test for Python 3.8
shell: cmd
run: |
Expand Down
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@ matrix:
sudo: true
- python: 3.8
env: TOXENV=py38
dist: xenial
sudo: true
- python: 'nightly'
dist: bionic
sudo: true
- python: 3.9
env: TOXENV=py39
dist: focal
sudo: true
- python: 'nightly'
env: TOXENV=py310
dist: focal
sudo: true
allow_failures:
- python: nightly

Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CHANGES
2.x.x
-----


- support Python 3.9

2.1.6 (2020-03-17)
------------------
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/buildwheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e -x
ARCH=`uname -p`
echo "arch=$ARCH"

for V in cp38-cp38 cp37-cp37m cp36-cp36m cp35-cp35m; do
for V in cp39-cp39 cp38-cp38 cp37-cp37m cp36-cp36m cp35-cp35m; do
PYBIN=/opt/python/$V/bin
rm -rf build src/cchardet/__pycache__ src/cchardet/*.cpp src/cchardet/*.pyc src/cchardet/*.so src/cchardet.egg-info src/tests/__pycache__ src/tests/*.pyc
$PYBIN/pip install -r requirements-dev.txt
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/develop/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-buster
FROM python:3.9-buster

RUN pip install -U cython chardet nose

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/slim/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim-buster
FROM python:3.9-slim-buster

ENV BUILD_DEPS gcc g++

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ def read(f):
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
],
keywords=[
'cython',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py35, py36, py37, py38, py39
envlist = py35, py36, py37, py38, py39, py310

[testenv]
commands =
Expand Down