diff options
author | Rust Saiargaliev <rustem.saiargaliev@thermondo.de> | 2021-01-29 22:15:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-29 13:15:20 -0800 |
commit | 76c7208b32bda679e6563d3231cc472a080c3015 (patch) | |
tree | d567ff41cd7b66dc5c3c07d226ba7b662ba1758b | |
parent | 7aa82423deafbc948de36ad9129701633cb1cad8 (diff) | |
download | markupsafe-76c7208b32bda679e6563d3231cc472a080c3015.tar.gz |
Add Python 3.9 support for 1.1.x (#163)
Add Python 3.9 to GitHub actions and tox
Replace 3.8 with 3.9 for windows, mac, docs and linting builds
Replace Azure pipelines with GHA
-rw-r--r-- | .azure-pipelines.yml | 89 | ||||
-rw-r--r-- | .github/workflows/build.yaml | 28 | ||||
-rw-r--r-- | .github/workflows/tests.yaml | 53 | ||||
-rw-r--r-- | tox.ini | 2 |
4 files changed, 82 insertions, 90 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml deleted file mode 100644 index 1f258e1..0000000 --- a/.azure-pipelines.yml +++ /dev/null @@ -1,89 +0,0 @@ -trigger: - branches: - include: - - master - - '*.x' - tags: - include: - - '*' - -jobs: - - job: Test - variables: - vmImage: 'ubuntu-latest' - python.version: '3.8' - TOXENV: 'py' - - strategy: - matrix: - Python 3.8 Linux: - vmImage: 'ubuntu-latest' - Python 3.8 Windows: - vmImage: 'windows-latest' - Python 3.8 Mac: - vmImage: 'macos-latest' - PyPy 3 Linux: - python.version: 'pypy3' - Python 3.7 Linux: - python.version: '3.7' - Python 3.6 Linux: - python.version: '3.6' - Python 3.5 Linux: - python.version: '3.5' - Python 2.7 Linux: - python.version: '2.7' - Docs: - TOXENV: 'docs' - Style: - TOXENV: 'style' - - pool: - vmImage: $[ variables.vmImage ] - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(python.version) - displayName: Use Python $(python.version) - - - script: pip --disable-pip-version-check install -U tox - displayName: Install tox - - - script: tox - displayName: Run tox - - - job: Build - dependsOn: Test - condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') - - strategy: - matrix: - Linux: - vmImage: 'ubuntu-latest' - Windows: - vmImage: 'windows-latest' - CIBW_SKIP: 'cp35-*' - Windows Python 3.5: - vmImage: 'vs2017-win2016' - CIBW_BUILD: 'cp35-*' - Mac: - vmImage: 'macos-latest' - - pool: - vmImage: $[ variables.vmImage ] - - steps: - - task: UsePythonVersion@0 - displayName: Use Python - - - script: choco install vcpython27 -f -y - displayName: Install Visual C++ for Python 2.7 - condition: eq(variables['vmImage'], 'windows-latest') - - - script: pip install cibuildwheel - displayName: Install cibuildwheel - - - script: cibuildwheel --output-dir wheels . - displayName: Run cibuildwheel - - - publish: 'wheels' diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..6999daa --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,28 @@ +name: Build +on: + push: + branches: + - master + - '*.x' + tags: + - '*' +jobs: + wheels: + name: ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + env: + CIBW_SKIP: 'cp27-* pp27-* cp35-*' + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.9' + - run: pip install cibuildwheel + - run: cibuildwheel + - uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 0000000..0cd5fda --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,53 @@ +name: Tests +on: + push: + branches: + - master + - '*.x' + pull_request: + branches: + - master + - '*.x' +jobs: + tests: + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - {name: Linux, python: '3.9', os: ubuntu-latest, tox: py39} + - {name: Windows, python: '3.9', os: windows-latest, tox: py39} + - {name: Mac, python: '3.9', os: macos-latest, tox: py39} + - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38} + - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37} + - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36} + - {name: 'PyPy', python: pypy3, os: ubuntu-latest, tox: pypy3} + - {name: Style, python: '3.9', os: ubuntu-latest, tox: style} + - {name: Docs, python: '3.9', os: ubuntu-latest, tox: docs} + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + - name: update pip + run: | + pip install -U wheel + pip install -U setuptools + python -m pip install -U pip + - name: get pip cache dir + id: pip-cache + run: echo "::set-output name=dir::$(pip cache dir)" + - name: cache pip + uses: actions/cache@v1 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}|${{ hashFiles('requirements/*.txt') }} + - name: cache pre-commit + uses: actions/cache@v1 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ matrix.python }}|${{ hashFiles('.pre-commit-config.yaml') }} + if: matrix.tox == 'style' + - run: pip install tox + - run: tox -e ${{ matrix.tox }} @@ -1,6 +1,6 @@ [tox] envlist = - py{38,37,36,35,27,py3,py} + py{39,38,37,36,35,27,py3,py} style docs skip_missing_interpreters = true |