Revert "ci: disable osx tests until a new pyyaml is released" (#2213)

pyyaml has been released and the brew formula has been updated.

This reverts commit 75c06e4.

.travis.yml

@@ -32,11 +32,10 @@ jobs:
       script: SNAPCRAFT_TEST_MOCK_MACHINE=armv7l sudo ./tools/travis/run_tests.sh tests/unit
     - if: type != cron
       script: SNAPCRAFT_TEST_MOCK_MACHINE=aarch64 sudo ./tools/travis/run_tests.sh tests/unit
-    # Disabled, LP: #1779855
-    # - stage: osx-integration-store
-    #   if: type != cron
-    #   os: osx
-    #   script: SNAPCRAFT_FROM_BREW=1 ./tools/travis/run_tests.sh tests.integration.store.test_store_login_logout use-run
+    - stage: osx-integration-store
+      if: type != cron
+      os: osx
+      script: SNAPCRAFT_FROM_BREW=1 ./tools/travis/run_tests.sh tests.integration.store.test_store_login_logout use-run
     - stage: snap
       if: type != cron
       script: sudo ./tools/travis/build_snapcraft_snap.sh

requirements-devel.txt

@@ -6,6 +6,7 @@ fixtures==3.0.0
 mccabe==0.6.1
 mypy==0.590
 testscenarios==0.5.0
-pexpect==4.2.0
+pexpect==4.2.0; sys.platform != 'darwin'
+pexpect==4.6.0; sys.platform == 'darwin'
 pyftpdlib==1.4.0
 pyramid==1.6

requirements.txt

@@ -4,7 +4,8 @@ docopt==0.6.2
 jsonschema==2.5.1
 paramiko==2.4.1
 progressbar33==2.4
-PyYAML==3.11
+PyYAML==3.11; sys.platform != 'darwin'
+PyYAML==3.13; sys.platform == 'darwin'
 pyxdg==0.25
 requests==2.9.1
 requests_unixsocket==0.1.5