Compare commits

...

5 Commits

Author SHA1 Message Date
Brad Warren
5b60c69fc1 no augeas 2018-07-02 16:18:04 -07:00
Brad Warren
533d948965 workaround travis 2018-07-02 16:15:54 -07:00
Brad Warren
9e347a251b does py37 work? 2018-07-02 16:08:01 -07:00
Brad Warren
dc1364a3bb add py37 tox environment 2018-07-02 15:33:18 -07:00
Brad Warren
6cd17e1283 Reorganize packages in tox to allow for py37 tests
certbot-dns-cloudflare doesn't currently work in Python 3.7 because it transitively depends on pyYAML which doesn't yet support Python 3.7. See https://github.com/yaml/pyyaml/issues/126 for more info.
2018-07-02 15:29:52 -07:00
2 changed files with 21 additions and 61 deletions

View File

@@ -1,4 +1,5 @@
language: python
dist: xenial
cache:
directories:
@@ -12,54 +13,8 @@ before_script:
matrix:
include:
- python: "2.7"
env: TOXENV=py27_install BOULDER_INTEGRATION=v1
sudo: required
services: docker
- python: "2.7"
env: TOXENV=py27_install BOULDER_INTEGRATION=v2
sudo: required
services: docker
- python: "2.7"
env: TOXENV=cover FYI="this also tests py27"
- sudo: required
env: TOXENV=nginx_compat
services: docker
before_install:
addons:
- python: "2.7"
env: TOXENV=lint
- python: "3.4"
- python: "3.7"
env: TOXENV=mypy
- python: "3.5"
env: TOXENV=mypy
- python: "2.7"
env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest'
sudo: required
services: docker
- python: "3.4"
env: TOXENV=py34
sudo: required
services: docker
- python: "3.6"
env: TOXENV=py36
sudo: required
services: docker
- sudo: required
env: TOXENV=apache_compat
services: docker
before_install:
addons:
- sudo: required
env: TOXENV=le_auto_trusty
services: docker
before_install:
addons:
- python: "2.7"
env: TOXENV=apacheconftest
sudo: required
- python: "2.7"
env: TOXENV=nginxroundtrip
# Only build pushes to the master branch, PRs, and branches beginning with
@@ -73,12 +28,10 @@ branches:
- /^test-.*$/
# container-based infrastructure
sudo: false
sudo: true
addons:
apt:
sources:
- augeas
packages: # Keep in sync with letsencrypt-auto-source/pieces/bootstrappers/deb_common.sh and Boulder.
- python-dev
- python-virtualenv
@@ -104,10 +57,3 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls'
notifications:
email: false
irc:
channels:
- secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
on_cancel: never
on_success: never
on_failure: always
use_notice: true

22
tox.ini
View File

@@ -14,8 +14,7 @@ pip_install = {toxinidir}/tools/pip_install_editable.sh
# before the script moves on to the next package. All dependencies are pinned
# to a specific version for increased stability for developers.
install_and_test = {toxinidir}/tools/install_and_test.sh
dns_packages =
certbot-dns-cloudflare \
python37_compatible_dns_packages =
certbot-dns-cloudxns \
certbot-dns-digitalocean \
certbot-dns-dnsimple \
@@ -25,14 +24,22 @@ dns_packages =
certbot-dns-nsone \
certbot-dns-rfc2136 \
certbot-dns-route53
all_packages =
dns_packages =
certbot-dns-cloudflare \
{[base]python37_compatible_dns_packages}
nondns_packages =
acme[dev] \
.[dev] \
certbot-apache \
{[base]dns_packages} \
certbot-nginx \
certbot-postfix \
letshelp-certbot
python37_compatible_packages =
{[base]nondns_packages} \
{[base]python37_compatible_dns_packages}
all_packages =
{[base]nondns_packages} \
{[base]dns_packages}
install_packages =
{toxinidir}/tools/pip_install_editable.sh {[base]all_packages}
source_paths =
@@ -62,6 +69,13 @@ commands =
setenv =
PYTHONHASHSEED = 0
[testenv:py37]
commands =
{[base]install_and_test} {[base]python37_compatible_packages}
python tests/lock_test.py
setenv =
{[testenv]setenv}
[testenv:py27-oldest]
commands =
{[testenv]commands}