diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
| commit | ec3fdd72dba89626635e5ea1c31ac65a31091042 (patch) | |
| tree | 043da5ecf08a14c1bee58ac055f3672e51108d8f | |
| parent | a6b7648d93eb36d8e52b5761604b187d02bc1b5a (diff) | |
| parent | 5f08308ffd13e952d65f780f6f9b74379d8b868a (diff) | |
Merge branch '2.0' into 2.1
# Conflicts:
# sites/www/changelog.rst
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 | ||||
| -rw-r--r-- | tox-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 6 |
4 files changed, 4 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 3b7b2b42..af32ba7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ python: - "3.3" - "3.4" - "3.5" + - "pypy-5.4.1" install: # Self-install for setup.py-driven deps - pip install -e . diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0aeb5961..dcafab78 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :support:`866 backported` (also :issue:`838`) Remove an old test-related file + we don't support, and add PyPy to Travis-CI config. Thanks to Pierce Lopez + for the final patch and Pedro Rodrigues for an earlier edition. * :release:`2.1.1 <2016-12-12>` * :release:`2.0.4 <2016-12-12>` * :release:`1.18.1 <2016-12-12>` diff --git a/tox-requirements.txt b/tox-requirements.txt deleted file mode 100644 index 9645f854..00000000 --- a/tox-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Not sure why tox can't just read setup.py? -cryptography >= 1.1 -pyasn1 >= 0.1.7 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index d420c1a3..00000000 --- a/tox.ini +++ /dev/null @@ -1,6 +0,0 @@ -[tox] -envlist = py26,py27,py33,py34,pypy - -[testenv] -commands = pip install -q -r tox-requirements.txt - python test.py |