commit 077d8d822489c013bf2268bf4f332129e85e739c
author tvalentyn <tvalentyn@users.noreply.github.com> Wed Jan 15 18:27:39 2020 -0800
committer GitHub <noreply@github.com> Wed Jan 15 18:27:39 2020 -0800
tree 3cec667f18f0f5848b7b892d3e4dd665c1333852
parent 72ee41fd6380e3c72e6b5b9e7eabeb174fd12ff1
parent cc4f60305259f6221a70304f769d0fd28cc79be9

Merge pull request #10568 [BEAM-9061] Add version guards to requirements file for integration tests.

sdks/python/scripts/run_integration_test.sh

diff --git a/sdks/python/scripts/run_integration_test.sh b/sdks/python/scripts/run_integration_test.sh
index 1133147..0804ace 100755
--- a/sdks/python/scripts/run_integration_test.sh
+++ b/sdks/python/scripts/run_integration_test.sh
@@ -194,8 +194,10 @@
   fi
 
   # Install test dependencies for ValidatesRunner tests.
-  echo "pyhamcrest" > postcommit_requirements.txt
-  echo "mock" >> postcommit_requirements.txt
+  # pyhamcrest==1.10.0 doesn't work on Py2.
+  # See: https://github.com/hamcrest/PyHamcrest/issues/131.
+  echo "pyhamcrest!=1.10.0,<2.0.0" > postcommit_requirements.txt
+  echo "mock<3.0.0" >> postcommit_requirements.txt
 
   # Options used to run testing pipeline on Cloud Dataflow Service. Also used for
   # running on DirectRunner (some options ignored).

sdks/python/setup.py

diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 8599b7f..65bfdbd 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -181,8 +181,9 @@
     'nose_xunitmp>=0.4.1',
     'pandas>=0.23.4,<0.25',
     'parameterized>=0.6.0,<0.8.0',
-    # pyhamcrest==1.10.0 requires Py3. Beam still supports Py2.
-    'pyhamcrest>=1.9,<1.10.0',
+    # pyhamcrest==1.10.0 doesn't work on Py2. Beam still supports Py2.
+    # See: https://github.com/hamcrest/PyHamcrest/issues/131.
+    'pyhamcrest>=1.9,!=1.10.0,<2.0.0',
     'pyyaml>=3.12,<6.0.0',
     'requests_mock>=1.7,<2.0',
     'tenacity>=5.0.2,<6.0',