summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-03-22 11:44:43 -0400
committerGitHub <noreply@github.com>2020-03-22 10:44:43 -0500
commitb81400becc79d445b5bc0b2dfe5c85130edd6646 (patch)
tree401fdf54a3ffb16495cbdc9c0ab443ad0a3c333b
parent22c89ea3891ab5926400f0d9d3af42357b5a540b (diff)
downloadpy-bcrypt-git-b81400becc79d445b5bc0b2dfe5c85130edd6646.tar.gz
Move Windows CI to Github Actions (#195)
-rw-r--r--.azure-pipelines/wheel-builder.yml12
-rw-r--r--.github/workflows/ci.yml43
-rw-r--r--.travis.yml4
-rw-r--r--README.rst2
-rw-r--r--azure-pipelines.yml63
-rw-r--r--setup.py1
-rw-r--r--tox.ini2
7 files changed, 50 insertions, 77 deletions
diff --git a/.azure-pipelines/wheel-builder.yml b/.azure-pipelines/wheel-builder.yml
index babb7d3..1ba2374 100644
--- a/.azure-pipelines/wheel-builder.yml
+++ b/.azure-pipelines/wheel-builder.yml
@@ -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'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..955f587
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -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 }} \ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 16e83e4..7d5e0b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/README.rst b/README.rst
index 73e6381..56d538a 100644
--- a/README.rst
+++ b/README.rst
@@ -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
------
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6730219..888f7f0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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'
diff --git a/setup.py b/setup.py
index e5ba3ed..6de648f 100644
--- a/setup.py
+++ b/setup.py
@@ -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",
diff --git a/tox.ini b/tox.ini
index b97d65b..0850d43 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]