summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-11-13 19:55:05 -0500
committerGitHub <noreply@github.com>2020-11-13 18:55:05 -0600
commitd22bdc87eede21e5ed592c1194e6a7002ef8a76a (patch)
tree146c8ac42ea688ce7975a9240c48d330bed1d974
parent488cd740bb9502af7faad79c0575c5454045e0d0 (diff)
downloadcryptography-d22bdc87eede21e5ed592c1194e6a7002ef8a76a.tar.gz
Move paramiko job to github actions (#5565)
-rwxr-xr-x.github/downstream.d/paramiko.sh (renamed from .travis/downstream.d/paramiko.sh)0
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.travis.yml31
-rwxr-xr-x.travis/install.sh12
-rwxr-xr-x.travis/run.sh11
-rw-r--r--MANIFEST.in2
-rw-r--r--README.rst3
-rw-r--r--tox.ini2
8 files changed, 3 insertions, 60 deletions
diff --git a/.travis/downstream.d/paramiko.sh b/.github/downstream.d/paramiko.sh
index c994defb0..c994defb0 100755
--- a/.travis/downstream.d/paramiko.sh
+++ b/.github/downstream.d/paramiko.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0c1625b7..f786bd600 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -213,6 +213,7 @@ jobs:
strategy:
matrix:
DOWNSTREAM:
+ - paramiko
- pyopenssl
- twisted
- aws-encryption-sdk
@@ -228,6 +229,7 @@ jobs:
python-version: 3.7
- run: python -m pip install -U pip wheel
- run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh install
+ - run: pip uninstall -y enum34
- run: pip install .
- run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh run
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 873a432cd..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-sudo: true
-dist: focal
-
-language: python
-
-cache:
- directories:
- - $HOME/.cache/pip
- - $HOME/ossl-2/
-
-# Only build master, the version branches (e.g. 1.7.x), and
-# version tags (which are apparently considered branches by travis)
-branches:
- only:
- - master
- - /^\d+\.\d+\.x$/
- - /^\d+\.\d+(\.\d+)?$/
-
-matrix:
- include:
- # Setting 'python' is just to make travis's UI a bit prettier
- # TODO: This needs to be moved to GHA, but it fails there. The
- # confusing part is why it passes on Travis!
- - python: 3.7
- env: DOWNSTREAM=paramiko
-
-install:
- - ./.travis/install.sh
-
-script:
- - ./.travis/run.sh
diff --git a/.travis/install.sh b/.travis/install.sh
deleted file mode 100755
index 4109cd135..000000000
--- a/.travis/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-pip install -U pip
-pip install virtualenv
-
-python -m virtualenv ~/.venv
-source ~/.venv/bin/activate
-# If we pin coverage it must be kept in sync with tox.ini and .github/workflows/ci.yml
-pip install tox coverage
diff --git a/.travis/run.sh b/.travis/run.sh
deleted file mode 100755
index 1b9200b9e..000000000
--- a/.travis/run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -ex
-
-source ~/.venv/bin/activate
-
-downstream_script="${TRAVIS_BUILD_DIR}/.travis/downstream.d/${DOWNSTREAM}.sh"
-if [ ! -x "$downstream_script" ]; then
- exit 1
-fi
-$downstream_script install
-pip install .
-$downstream_script run
diff --git a/MANIFEST.in b/MANIFEST.in
index 2b90d2465..5c82725a4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,8 +16,6 @@ recursive-include tests *.py
exclude vectors
recursive-exclude vectors *
-exclude .travis.yml .travis
-recursive-exclude .travis *
recursive-exclude .github *
exclude release.py .coveragerc codecov.yml .readthedocs.yml dev-requirements.txt rtd-requirements.txt tox.ini
diff --git a/README.rst b/README.rst
index 586cb1b0b..10de198b8 100644
--- a/README.rst
+++ b/README.rst
@@ -9,9 +9,6 @@ pyca/cryptography
:target: https://cryptography.io
:alt: Latest Docs
-.. image:: https://travis-ci.org/pyca/cryptography.svg?branch=master
- :target: https://travis-ci.org/pyca/cryptography
-
.. image:: https://github.com/pyca/cryptography/workflows/CI/badge.svg?branch=master
:target: https://github.com/pyca/cryptography/actions?query=workflow%3ACI+branch%3Amaster
diff --git a/tox.ini b/tox.ini
index 2ecd30a22..e6e04575b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ extras =
test
ssh: ssh
deps =
- # This must be kept in sync with .travis/install.sh and .github/workflows/ci.yml
+ # This must be kept in sync with .github/workflows/ci.yml
coverage
./vectors
randomorder: pytest-randomly