diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2020-12-22 20:11:29 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-22 21:11:29 -0500 |
commit | 8f8a0d945d4193afcebf58566958b01103743d53 (patch) | |
tree | 8ccd9829c84151f1d148fcdf85911f5c1c4d5f38 | |
parent | 71d92347b0c084c2b6aa1daa6a83d31c48e958a0 (diff) | |
download | py-bcrypt-git-8f8a0d945d4193afcebf58566958b01103743d53.tar.gz |
remove travis, add more GA jobs (#243)
* remove travis, add more GA jobs
no arm64 CI job yet
* remove all but minimum/latest jobs for windows and macos
we ship abi3 on all platforms and these jobs don't have a lot of value.
we test on all versions through linux.
* indentation is hard
-rw-r--r-- | .github/workflows/ci.yml | 56 | ||||
-rw-r--r-- | .travis.yml | 71 | ||||
-rwxr-xr-x | .travis/install.sh | 10 | ||||
-rwxr-xr-x | .travis/run.sh | 7 | ||||
-rw-r--r-- | README.rst | 3 | ||||
-rw-r--r-- | tox.ini | 2 |
6 files changed, 49 insertions, 100 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f12610..b1dab6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,12 @@ jobs: matrix: PYTHON: - {VERSION: "3.6", TOXENV: "py36"} - - {VERSION: "3.7", TOXENV: "py37"} - - {VERSION: "3.8", TOXENV: "py38"} - {VERSION: "3.9", TOXENV: "py39"} name: "Python ${{ matrix.PYTHON.VERSION }} on macOS" steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2.2.0 + uses: actions/setup-python@v2.2.1 with: python-version: ${{ matrix.PYTHON.VERSION }} @@ -39,14 +37,12 @@ jobs: - {ARCH: 'x64', WINDOWS: 'win64'} PYTHON: - {VERSION: "3.6", TOXENV: "py36"} - - {VERSION: "3.7", TOXENV: "py37"} - - {VERSION: "3.8", TOXENV: "py38"} - {VERSION: "3.9", TOXENV: "py39"} name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}" steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2.2.0 + uses: actions/setup-python@v2.2.1 with: python-version: ${{ matrix.PYTHON.VERSION }} architecture: ${{ matrix.WINDOWS.ARCH }} @@ -55,3 +51,47 @@ jobs: - run: tox env: TOXENV: ${{ matrix.PYTHON.TOXENV }} + linux: + runs-on: ubuntu-latest + strategy: + matrix: + PYTHON: + - {VERSION: "3.9", TOXENV: "pep8,packaging"} + - {VERSION: "3.9", TOXENV: "mypy"} + - {VERSION: "3.6", TOXENV: "py36"} + - {VERSION: "3.7", TOXENV: "py37"} + - {VERSION: "3.8", TOXENV: "py38"} + - {VERSION: "3.9", TOXENV: "py39"} + - {VERSION: "pypy3", TOXENV: "pypy3"} + name: "${{ matrix.PYTHON.TOXENV }} on linux" + steps: + - uses: actions/checkout@v2 + - name: Setup python + uses: actions/setup-python@v2.2.1 + with: + python-version: ${{ matrix.PYTHON.VERSION }} + - run: pip install tox + - run: tox + env: + TOXENV: ${{ matrix.PYTHON.TOXENV }} + + manylinux-arm64: + name: "${{ matrix.PYTHON.TOXENV }} on manylinux2014-aarch64" + runs-on: ubuntu-20.04 + strategy: + matrix: + PYTHON: + - {VERSION: "cp36-cp36m", TOXENV: 'py36'} + steps: + - uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + with: + platforms: arm64 + - uses: docker://quay.io/pypa/manylinux2014_aarch64 + with: + args: | + bash -c "set -xe; + /opt/python/${{ matrix.PYTHON.VERSION }}/bin/python -m venv .venv; + .venv/bin/pip install -U tox; + .venv/bin/tox -e ${{ matrix.PYTHON.TOXENV }};" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ba8189c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -language: python -# Run on Travis CI's docker infrastructure -sudo: false - -matrix: - include: - - python: 3.6 - env: TOXENV=py36 CC=gcc - - python: 3.6 - env: TOXENV=py36 CC=gcc - - python: 3.7 - env: TOXENV=py37 CC=gcc - dist: xenial - sudo: true - - python: 3.8 - env: TOXENV=py38 CC=gcc - dist: xenial - sudo: true - - python: pypy3.6-7.3.1 - env: TOXENV=pypy3 CC=gcc - - python: 3.6 - env: TOXENV=py36 CC=clang - - python: 3.7 - env: TOXENV=py37 CC=clang - dist: xenial - sudo: true - - python: 3.8 - env: TOXENV=py38 CC=clang - dist: xenial - sudo: true - - python: pypy3.6-7.3.1 - env: TOXENV=pypy3 CC=clang - - python: 3.8 - env: TOXENV=pep8 - - python: 3.8 - env: TOXENV=mypy - - env: TOXENV=packaging - - python: 3.8 - env: TOXENV=py38 CC=gcc - dist: focal - arch: arm64-graviton2 - virt: lxd - group: edge - - python: 3.8 - env: TOXENV=py38 CC=clang - dist: focal - arch: arm64-graviton2 - virt: lxd - group: edge - -install: .travis/install.sh - -script: .travis/run.sh - -branches: - only: - - master - - /\d+\.\d+\.x/ - - /\d+\.\d+(\.\d+)?/ - -notifications: -irc: - channels: - # This is set to a secure variable to prevent forks from notifying the - # IRC channel whenever they fail a build. This can be removed when travis - # implements https://github.com/travis-ci/travis-ci/issues/1094. - # The value encrypted here was created via - # travis encrypt "irc.freenode.org#cryptography-dev" - - secure: "SYCVjMUGx5sJ5iEdgEz1iUG6QC7Ep1CGlAatbW8AmNTCurnJHN1Ezm1ix3mbGDevdeyQC/eC1iOXEEj6jhImUziUAG1YtpgHsJ1H3J5MNU/WUNuj6TGESa9iMq6K2cAAIWGvDR0hx4tO5/p09GevL9GVmc2IelUKuGKNkOVRGrI=" - use_notice: true - skip_join: true diff --git a/.travis/install.sh b/.travis/install.sh deleted file mode 100755 index ee77847..0000000 --- a/.travis/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -e -set -x - -pip install virtualenv - -python -m virtualenv ~/.venv -source ~/.venv/bin/activate -pip install tox diff --git a/.travis/run.sh b/.travis/run.sh deleted file mode 100755 index 3dce065..0000000 --- a/.travis/run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e -set -x - -source ~/.venv/bin/activate -tox @@ -5,9 +5,6 @@ bcrypt :target: https://pypi.org/project/bcrypt/ :alt: Latest Version -.. image:: https://travis-ci.org/pyca/bcrypt.svg?branch=master - :target: https://travis-ci.org/pyca/bcrypt - .. image:: https://github.com/pyca/bcrypt/workflows/CI/badge.svg?branch=master :target: https://github.com/pyca/bcrypt/actions?query=workflow%3ACI+branch%3Amaster @@ -8,7 +8,7 @@ extras = deps = coverage commands = - coverage run -m pytest --strict {posargs} + coverage run -m pytest --strict-markers {posargs} coverage report -m --fail-under 100 [testenv:pep8] |