Merge branch 'master' into add-3.7

thomasrockhu · web-flow · commit 71f5066ae2d0 · 2019-06-06T15:57:54.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ coverage.xml
 dist
 htmlcov
 venv
+*.sw[op]
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,17 @@
+
 language: python
 cache: pip
 notifications:
   email: false
-
+dist: xenial
+sudo: false
 python:
   - 2.7
   - pypy
   - 3.4
   - 3.5
-  - 3.6 
+  - 3.6
+  - 3.7
   - pypy3
 matrix:
   include:
diff --git a/README.md b/README.md
@@ -101,4 +101,4 @@ after_success:
 
 ## Copyright
 
-> Copyright 2014-2017 codecov
+> Copyright 2014-2019 codecov
diff --git a/appveyor.yml b/appveyor.yml
@@ -13,35 +13,37 @@ environment:
     # a later point release.
 
     - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_VERSION: "2.7.x" # currently 2.7.15
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_VERSION: "2.7.x" # currently 2.7.15
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.x" # currently 3.4.4
       PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x" # currently 3.4.4
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6.x" # currently 3.6.6
       PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x" # currently 3.6.6
       PYTHON_ARCH: "64"
 
-    # Also test Python 2.6.6 not pre-installed
-
-    - PYTHON: "C:\\Python266"
-      PYTHON_VERSION: "2.6.6"
+    - PYTHON: "C:\\Python37"
+      PYTHON_VERSION: "3.7.x" # currently 3.7.1
       PYTHON_ARCH: "32"
 
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x" # currently 3.7.1
+      PYTHON_ARCH: "64"
+
 install:
   # Download the Appveyor Python build accessories into subdirectory .\appveyor
   - mkdir appveyor
diff --git a/tests/test.py b/tests/test.py
@@ -204,6 +204,7 @@ def test_disable_search(self):
         else:
             raise Exception("Did not raise AssertionError")
 
+    @unittest.skipIf(os.getenv('CI') == "True" and os.getenv('APPVEYOR') == 'True', 'Skip AppVeyor CI test')
     def test_prefix(self):
         self.fake_report()
         res = self.run_cli(prefix='/foo/bar/', dump=True, token='a', branch='b', commit='c')

-Original file line number
+Diff line change
 dist
 htmlcov
 venv
 +*.sw[op]
Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,4 @@ after_success:`
`101`	`101`
`102`	`102`	`## Copyright`
`103`	`103`
`104`		`-> Copyright 2014-2017 codecov`
	`104`	`+> Copyright 2014-2019 codecov`