wip

.travis.yml

@@ -7,34 +7,39 @@ install:
 env:
   - TOX_ENV=flake8
 
-  - TOX_ENV=py27-tw121
+#  - TOX_ENV=py27-tw121
-  - TOX_ENV=py27-tw132
+#  - TOX_ENV=py27-tw132
-  - TOX_ENV=py27-tw154
+#  - TOX_ENV=py27-tw154
-  - TOX_ENV=py27-tw165
+#  - TOX_ENV=py27-tw165
-  - TOX_ENV=py27-twtrunk
+#  - TOX_ENV=py27-twtrunk
-  - TOX_ENV=py27-asyncio
+#  - TOX_ENV=py27-asyncio
+#
+#  - TOX_ENV=pypy-tw121
+#  - TOX_ENV=pypy-tw132
+#  - TOX_ENV=pypy-tw154
+#  - TOX_ENV=pypy-tw165
+#  - TOX_ENV=pypy-twtrunk
+#  - TOX_ENV=pypy-asyncio
+#
+#  - TOX_ENV=py33-tw154
+#  - TOX_ENV=py33-tw165
+#  - TOX_ENV=py33-twtrunk
+#  - TOX_ENV=py33-asyncio
+#
+#  - TOX_ENV=py34-tw154
+#  - TOX_ENV=py34-tw165
+#  - TOX_ENV=py34-twtrunk
+#  - TOX_ENV=py34-asyncio
 
-  - TOX_ENV=pypy-tw121
+  - TOX_ENV=py35-tw154
-  - TOX_ENV=pypy-tw132
+  - TOX_ENV=py35-tw165
-  - TOX_ENV=pypy-tw154
+  - TOX_ENV=py35-twtrunk
-  - TOX_ENV=pypy-tw165
+  - TOX_ENV=py35-asyncio
-  - TOX_ENV=pypy-twtrunk
-  - TOX_ENV=pypy-asyncio
 
-  - TOX_ENV=py33-tw154
+  - TOX_ENV=py36-tw154
-  - TOX_ENV=py33-tw165
+  - TOX_ENV=py36-tw165
-  - TOX_ENV=py33-twtrunk
+  - TOX_ENV=py36-twtrunk
-  - TOX_ENV=py33-asyncio
+  - TOX_ENV=py36-asyncio
-
-  - TOX_ENV=py34-tw154
-  - TOX_ENV=py34-tw165
-  - TOX_ENV=py34-twtrunk
-  - TOX_ENV=py34-asyncio
-
-#  - TOX_ENV=py35-tw154
-#  - TOX_ENV=py35-tw165
-#  - TOX_ENV=py35-twtrunk
-#  - TOX_ENV=py35-asyncio
 
 script:
   - tox -c tox.ini -e $TOX_ENV
@@ -47,24 +52,6 @@ after_success:
 matrix:
   fast_finish: true
 
-  # https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
-  include:
-    - python: 3.5
-      env:
-      - TOX_ENV=py35-tw154
-
-    - python: 3.5
-      env:
-      - TOX_ENV=py35-tw165
-
-    - python: 3.5
-      env:
-      - TOX_ENV=py35-twtrunk
-
-    - python: 3.5
-      env:
-      - TOX_ENV=py35-asyncio
-
 notifications:
    irc:
       channels:

Makefile

@@ -47,7 +47,12 @@ clean:
 	find . -name "*.pyc" -type f -exec rm -f {} \;
 	find . -name "*__pycache__" -type d -exec rm -rf {} \;
 
+# upload to our internal deployment system
+upload: clean
+	python setup.py bdist_wheel
+	aws s3 cp dist/*.whl s3://fabric-deploy/
+
 # publish to PyPI
 publish: clean
-	python setup.py sdist bdist_wheel
+	python setup.py bdist_wheel
 	twine upload dist/*

tox.ini

@@ -6,6 +6,7 @@ envlist =
     py33-{tw154,tw165,twtrunk,asyncio}
     py34-{tw154,tw165,twtrunk,asyncio}
     py35-{tw154,tw165,twtrunk,asyncio}
+    py36-{tw154,tw165,twtrunk,asyncio}
 
 [testenv]
 deps =