summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-10-30 21:19:41 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2018-10-30 09:19:41 -0400
commit271ac9f2af50859a4f7e4ece622cb8d59710cc8b (patch)
tree22a7d1b20d631b3b38845929590e8d1d0fd6a4d8
parentb8c466aac02ddddecc520c8c8646edec70dd5895 (diff)
downloadpy-bcrypt-git-271ac9f2af50859a4f7e4ece622cb8d59710cc8b.tar.gz
fix our CI rot (#155)
-rw-r--r--.travis.yml18
-rw-r--r--Jenkinsfile4
-rw-r--r--tox.ini1
3 files changed, 17 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 02a4aad..a724479 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,11 +41,11 @@ matrix:
env: TOXENV=py3pep8
- language: generic
os: osx
- osx_image: xcode7.3
+ osx_image: xcode9.4
env: TOXENV=py27
- language: generic
os: osx
- osx_image: xcode7.3
+ osx_image: xcode9.4
env: TOXENV=py35
install: .travis/install.sh
@@ -55,3 +55,17 @@ 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: "JPzgnGLaHrwuty/kp7MZVf3I4iOLNzq+ZmSmKJxwIaIpJ9rkxh65gCyMp7qoQqbpdp1KYjSgrtZ7wxEQjxljMFYRS22uTnEP2GnxRXGdC2MqhZ1+1UP0YvFuMlYDh3hx/9M6ObF/8MKrGCIlU54IIrBIYQoiEnGKyNK/snR5V9U="
+ use_notice: true
+ skip_join: true
diff --git a/Jenkinsfile b/Jenkinsfile
index 9706123..66633e4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,10 +7,6 @@ def configs = [
label: 'windows64',
toxenvs: ['py27', 'py34', 'py35', 'py36', 'py37'],
],
- [
- label: 'freebsd11',
- toxenvs: ['py27'],
- ],
]
def build(label, toxenv) {
diff --git a/tox.ini b/tox.ini
index bbc1549..cd87450 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,6 +37,7 @@ commands =
[flake8]
+ignore = W504
exclude = .tox,*.egg
select = E,W,F,N,I
application-import-names = bcrypt,tests