Enable Python 3.9 on CI

messense · Oct 10, 2020 · 2e14d8f · 2e14d8f
1 parent f984611
commit 2e14d8f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -9,35 +9,34 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
 
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-          override: true
-
       - name: Build Wheels - Linux
         if: startsWith(matrix.os, 'ubuntu')
+        env:
+          PYTHON_VERSION: python${{ matrix.python-version }}
         run: |
           docker build . -t maturin:latest
-          docker run --rm -v $(pwd):/io maturin:latest sh -c "source ~/.cargo/env && maturin build --release --out wheels"
+          docker run --rm -v $(pwd):/io maturin:latest sh -c "source ~/.cargo/env && maturin build -i $PYTHON_VERSION --release --out wheels"
 
       - name: Build Wheels - Non-Linux
         if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
         run: |
           pip install maturin
-          maturin build --release --out wheels
+          maturin build -i python --release --out wheels
 
       - name: Install wheel
         run: pip install rjieba --no-index --find-links wheels

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,31 +13,28 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        components: clippy
-        override: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
         architecture: 'x64'
 
     - name: Build Wheels - Linux
       if: startsWith(matrix.os, 'ubuntu')
+      env:
+        PYTHON_VERSION: python${{ matrix.python-version }}
       run: |
         docker build . -t maturin:latest
-        docker run --rm -v $(pwd):/io maturin:latest sh -c "source ~/.cargo/env && maturin build --release --out dist"
+        docker run --rm -v $(pwd):/io maturin:latest sh -c "source ~/.cargo/env && maturin build -i $PYTHON_VERSION --release --out wheels"
 
     - name: Build Wheels - Non-Linux
       if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')
       run: |
         pip install maturin
-        maturin build --release --out dist
+        maturin build -i python --release --out dist
 
     - name: Publish package - Non-Linux
       if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macos')

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux1_x86_64
+FROM quay.io/pypa/manylinux2010_x86_64
 
 ENV HOME /root
 ENV PATH $HOME/.cargo/bin:$PATH
@@ -10,7 +10,7 @@ RUN curl https://sh.rustup.rs -sSf | \
     sh -s -- --default-toolchain stable -y
 
 # Add all supported python versions
-ENV PATH /opt/python/cp35-cp35m/bin/:/opt/python/cp36-cp36m/bin/:/opt/python/cp37-cp37m/bin/:/opt/python/cp38-cp38/bin/:$PATH
+ENV PATH /opt/python/cp35-cp35m/bin/:/opt/python/cp36-cp36m/bin/:/opt/python/cp37-cp37m/bin/:/opt/python/cp38-cp38/bin/:/opt/python/cp39-cp39/bin/:$PATH
 
 RUN python3 -m pip install --no-cache-dir cffi
 RUN python3 -m pip install maturin