Merge branch 'master' into pyup-pin-requests-2.18.4

catlee · Mar 7, 2018 · a9d3bcc · a9d3bcc
2 parents bf5e95d + 8cf6c55
commit a9d3bcc
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 436 deletions.
diff --git a/.pyup.yml b/.pyup.yml
@@ -0,0 +1,3 @@
+# Bump requirements in tox.ini too
+requirements:
+    - tox.ini
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -23,6 +23,6 @@ include requirements.in
 include test-requirements.txt
 include test-requirements.in
 
-include tox.ini .travis.yml appveyor.yml
+include tox.ini .travis.yml .pyup.yml
 
 global-exclude *.py[cod] __pycache__ *.so *.dylib *.sw?
diff --git a/ci/appveyor-bootstrap.py b/ci/appveyor-bootstrap.py
diff --git a/ci/appveyor-download.py b/ci/appveyor-download.py
diff --git a/ci/appveyor-with-compiler.cmd b/ci/appveyor-with-compiler.cmd
diff --git a/ci/bootstrap.py b/ci/bootstrap.py
diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml