You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bo...@apache.org on 2020/01/20 20:19:50 UTC
[beam] branch release-2.19.0 updated: Add version guards to
requirements file for integration tests.
This is an automated email from the ASF dual-hosted git repository.
boyuanz pushed a commit to branch release-2.19.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.19.0 by this push:
new b87e306 Add version guards to requirements file for integration tests.
new ee43260 Merge pull request #10619 from tvalentyn/cp_10568
b87e306 is described below
commit b87e3060d62b3b2fd5254bb604be5a47bd5a8c6a
Author: Valentyn Tymofieiev <va...@google.com>
AuthorDate: Mon Jan 13 11:15:27 2020 -0800
Add version guards to requirements file for integration tests.
---
sdks/python/scripts/run_integration_test.sh | 6 ++++--
sdks/python/setup.py | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
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 @@ if [[ -z $PIPELINE_OPTS ]]; then
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).
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 @@ REQUIRED_TEST_PACKAGES = [
'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',