Merge pull request #585 from njsmith/reenable-jenkins

Switch back to Jenkins for MacOS builds

.travis.yml

@@ -26,15 +26,15 @@ matrix:
     - python: 3.8-dev
       dist: xenial
       sudo: required
-    - os: osx
-      language: generic
-      env: MACPYTHON=3.5.4
-    - os: osx
-      language: generic
-      env: MACPYTHON=3.6.6
-    - os: osx
-      language: generic
-      env: MACPYTHON=3.7.0
+    # - os: osx
+    #   language: generic
+    #   env: MACPYTHON=3.5.4
+    # - os: osx
+    #   language: generic
+    #   env: MACPYTHON=3.6.6
+    # - os: osx
+    #   language: generic
+    #   env: MACPYTHON=3.7.0
 
 script:
   - ci/travis.sh

Jenkinsfile

@@ -1,8 +1,7 @@
 def configs = [
     [
         label: 'sierra',
-        // pyversions: ['python3.5', 'python3.6'],
-        pyversions: ['python3.5'],
+        pyversions: ['python3.5', 'python3.6', 'python3.7'],
     ],
 ]
 
@@ -53,6 +52,7 @@ def build(pyversion, label) {
                             export PATH="/usr/local/bin:\${PATH}"
                             export PATH="/Library/Frameworks/Python.framework/Versions/3.5/bin:\${PATH}"
                             export PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:\${PATH}"
+                            export PATH="/Library/Frameworks/Python.framework/Versions/3.7/bin:\${PATH}"
 
                             # Workaround for https://github.com/pypa/pip/issues/5345
                             # See also:

test-requirements.txt

@@ -4,3 +4,7 @@ ipython        # for the IPython traceback integration tests
 pyOpenSSL      # for the ssl tests
 trustme        # for the ssl tests
 pytest-faulthandler
+
+# Temporary hack to work around https://github.com/MagicStack/immutables/issues/7
+# until a new version of contextvars is released
+immutables == 0.6