pyca/bcrypt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Windows CI to Github Actions (#195)

Browse Source
This commit is contained in:
Alex Gaynor 2020-03-22 11:44:43 -04:00 committed by GitHub
parent 22c89ea389
commit b81400becc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 50 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.azure-pipelines/wheel-builder.yml
View File

@ -12,7 +12,7 @@ jobs:
PYTHON_DOWNLOAD_URL: "https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg"
PYTHON_BIN_PATH: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
Python3:
python.version: '3.4'
python.version: '3.5'
PYTHON_DOWNLOAD_URL: "https://www.python.org/ftp/python/3.7.3/python-3.7.3-macosx10.6.pkg"
PYTHON_BIN_PATH: /Library/Frameworks/Python.framework/Versions/3.7/bin/python3
steps:
@ -67,7 +67,7 @@ jobs:
Python27mu:
PYTHON_VERSION: 'cp27-cp27mu'
Python3m:
PYTHON_VERSION: 'cp34-cp34m'
PYTHON_VERSION: 'cp35-cp35m'
steps:
- script: /opt/python/$PYTHON_VERSION/bin/python -m virtualenv .venv
displayName: Create virtualenv
@ -111,14 +111,6 @@ jobs:
containerImage: 'pyca/cryptography-runner-windows:py27-x86_64'
PYTHON_VERSION: '27'
WINDOWS_ARCH: 'x86_64'
Python34-x86:
containerImage: 'pyca/cryptography-runner-windows:py34-x86'
PYTHON_VERSION: '34'
WINDOWS_ARCH: 'x86'
Python34-x86-64:
containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
PYTHON_VERSION: '34'
WINDOWS_ARCH: 'x86_64'
Python35-x86:
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
PYTHON_VERSION: '35'

43
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,43 @@
on:
pull_request: {}
push:
branches:
- master
tags:
- '*'
jobs:
windows:
runs-on: windows-latest
strategy:
matrix:
WINDOWS:
- {ARCH: 'x86', WINDOWS: 'win32'}
- {ARCH: 'x64', WINDOWS: 'win64'}
PYTHON:
- {VERSION: "2.7", TOXENV: "py27"}
- {VERSION: "3.5", TOXENV: "py35"}
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.7", TOXENV: "py37"}
- {VERSION: "3.8", TOXENV: "py38"}
name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}"
steps:
- uses: actions/checkout@master
- name: Setup python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.PYTHON.VERSION }}
architecture: ${{ matrix.WINDOWS.ARCH }}
- name: Install MSVC for Python 2.7
run: |
Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile VCForPython27.msi
Start-Process msiexec -Wait -ArgumentList @('/i', 'VCForPython27.msi', '/qn', 'ALLUSERS=1')
Remove-Item VCForPython27.msi -Force
shell: powershell
if: matrix.PYTHON.VERSION == '2.7'
- run: pip install tox
- run: tox
env:
TOXENV: ${{ matrix.PYTHON.TOXENV }}

4
.travis.yml
View File

@ -6,8 +6,6 @@ matrix:
include:
- python: 2.7
env: TOXENV=py27 CC=gcc
- python: 3.4
env: TOXENV=py34 CC=gcc
- python: 3.5
env: TOXENV=py35 CC=gcc
- python: 3.6
@ -26,8 +24,6 @@ matrix:
env: TOXENV=pypy CC=gcc
- python: 2.7
env: TOXENV=py27 CC=clang
- python: 3.4
env: TOXENV=py34 CC=clang
- python: 3.5
env: TOXENV=py35 CC=clang
- python: 3.6

2
README.rst
View File

@ -198,7 +198,7 @@ Compatibility
-------------
This library should be compatible with py-bcrypt and it will run on Python
2.7, 3.4+, and PyPy 2.6+.
2.7, 3.5+, and PyPy 2.6+.
C Code
------

63
azure-pipelines.yml
View File

@ -15,9 +15,6 @@ jobs:
Python27:
python.version: '2.7'
TOXENV: py27
Python34:
python.version: '3.4'
TOXENV: py34
Python35:
python.version: '3.5'
TOXENV: py35
@ -27,6 +24,9 @@ jobs:
Python37:
python.version: '3.7'
TOXENV: py37
Python38:
python.version: '3.8'
TOXENV: py38
steps:
- task: UsePythonVersion@0
inputs:
@ -38,60 +38,3 @@ jobs:
- script: tox
displayName: 'Run tests'
- job: 'win'
pool:
vmImage: 'windows-2019'
container: $[variables.containerImage]
strategy:
matrix:
Python27-x86:
TOXENV: py27
containerImage: 'pyca/cryptography-runner-windows:py27-x86'
PYTHON_DIR: 'Python27'
Python27-x86-64:
TOXENV: py27
containerImage: 'pyca/cryptography-runner-windows:py27-x86_64'
PYTHON_DIR: 'Python27'
Python34-x86:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86'
PYTHON_DIR: 'Python34'
Python34-x86-64:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
PYTHON_DIR: 'Python34'
Python35-x86:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
PYTHON_DIR: 'Python35'
Python35-x86-64:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86_64'
PYTHON_DIR: 'Python35'
Python36-x86:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
PYTHON_DIR: 'Python36'
Python36-x86-64:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
PYTHON_DIR: 'Python36'
Python37-x86:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
PYTHON_DIR: 'Python37'
Python37-x86-64:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
PYTHON_DIR: 'Python37'
Python38-x86:
TOXENV: py38
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
PYTHON_DIR: 'Python38'
Python38-x86-64:
TOXENV: py38
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
PYTHON_DIR: 'Python38'
steps:
- script: "C:/%PYTHON_DIR%/Scripts/tox"
displayName: 'Run tests'

1
setup.py
View File

@ -229,7 +229,6 @@ setup(
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",

2
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py27,pypy,py34,py35,py36,py37,py38,pep8,py3pep8,packaging
envlist = py27,pypy,py35,py36,py37,py38,pep8,py3pep8,packaging
isolated_build = True
[testenv]