fixes #46 - Rename '-integration' tox environments to '-versioncheck'…

… and disable on Travis; update development docs to run these manually.
jantman · Aug 11, 2015 · a946692 · a946692
1 parent c5b0225
commit a946692
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,13 +13,6 @@ env:
   - TOXENV=py34-unit PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
   - TOXENV=pypy-unit PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
   - TOXENV=pypy3-unit PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=py26-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=py27-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=py32-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=py33-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=py34-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=pypy-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
-  - TOXENV=pypy3-integration PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
   - TOXENV=docs PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
   - TOXENV=cov PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Pre-release (develop branch)
+----------------------------
+
+* Rename ``-integration`` tox environments to ``-versioncheck`` and disable on Travis; update development docs to run these manually.
+
 0.1.0 (2015-07-25)
 ------------------
 

diff --git a/docs/source/development.rst b/docs/source/development.rst
@@ -190,7 +190,8 @@ Release Checklist
 
 1. Open an issue for the release; cut a branch off ``develop`` for that issue.
 2. Build docs (``tox -e docs``) and ensure they're current; commit any changes.
-3. Ensure that Travis tests passing in all environments.
+3. Ensure that Travis tests passing in all environments. If there were any changes to ``awslimitchecker.versioncheck``,
+   manually run the ``-versioncheck`` tox environments (these are problematic in Travis and with PRs).
 4. Ensure that test coverage is no less than the last release (ideally, 100%).
 5. Create or update an actual IAM user with the policy from ``awslimitchecker --iam-policy``;
    run the command line wrapper and ensure that the policy works and contains all needed permissions.

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{unit,integration}, docs, cov
+envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{unit,versioncheck}, docs, cov
 
 [testenv]
 deps =
@@ -30,7 +30,7 @@ commands =
     env
     pip freeze
     unit: py.test -rxs -vv --pep8 --flakes --blockage -m "not versioncheck" {posargs} awslimitchecker
-    integration: py.test -rxs -vv -s --pep8 --flakes --blockage -m "versioncheck" {posargs} awslimitchecker
+    versioncheck: py.test -rxs -vv -s --pep8 --flakes --blockage -m "versioncheck" {posargs} awslimitchecker
 
 # always recreate the venv
 recreate = True
@@ -62,7 +62,7 @@ commands =
     env
     pip freeze
     unit: py.test -rxs -vv --pep8 --flakes --blockage -m "not versioncheck" {posargs} awslimitchecker
-    integration: py.test -rxs -vv -s --pep8 --flakes --blockage -m "versioncheck" {posargs} awslimitchecker
+    versioncheck: py.test -rxs -vv -s --pep8 --flakes --blockage -m "versioncheck" {posargs} awslimitchecker
 
 # always recreate the venv
 recreate = True