Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pytest to support Python 3.10 #22055

Merged
merged 6 commits into from
Aug 1, 2022
Merged

Update pytest to support Python 3.10 #22055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
791add3
Update Pytest version to support Python 3.10
AnandInguva Jun 1, 2022
ef19c25
Update pytest-cov
AnandInguva Jun 17, 2022
db2c05f
update dependencies with updated pytest related changes
AnandInguva Jul 11, 2022
4532e78
set upToDateWhen = false
AnandInguva Jul 27, 2022
3bdd872
Merge branch 'master' into update-pytest
AnandInguva Jul 28, 2022
a8a01f5
update-requirements-file
AnandInguva Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,6 +2510,7 @@ class BeamModulePlugin implements Plugin<Project> {
// specific binary here could make gradle delete it while pip will believe
// the package is fully installed.
outputs.dirs(project.ext.envdir)
outputs.upToDateWhen { false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch. thanks!

}

project.ext.pythonSdkDeps = project.files(
Expand Down
15 changes: 7 additions & 8 deletions sdks/python/container/py37/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

absl-py==1.2.0
astunparse==1.6.3
atomicwrites==1.4.1
attrs==21.4.0
attrs==22.1.0
beautifulsoup4==4.11.1
bs4==0.0.1
cachetools==4.2.4
Expand Down Expand Up @@ -83,6 +82,7 @@ hdfs==2.7.0
httplib2==0.20.4
idna==3.3
importlib-metadata==4.12.0
iniconfig==1.1.1
joblib==1.1.0
keras==2.9.0
Keras-Preprocessing==1.1.2
Expand All @@ -91,7 +91,6 @@ Markdown==3.4.1
MarkupSafe==2.1.1
mmh3==3.0.0
mock==2.0.0
more-itertools==8.13.0
nltk==3.7
nose==1.3.7
numpy==1.21.6
Expand All @@ -104,7 +103,7 @@ packaging==21.3
pandas==1.3.5
parameterized==0.8.1
pbr==5.9.0
pluggy==0.13.1
pluggy==1.0.0
proto-plus==1.20.6
protobuf==3.19.4
psycopg2-binary==2.9.3
Expand All @@ -118,10 +117,10 @@ PyHamcrest==1.10.1
pymongo==3.12.3
PyMySQL==1.0.2
pyparsing==3.0.9
pytest==4.6.11
pytest==7.1.2
pytest-forked==1.4.0
pytest-timeout==1.4.2
pytest-xdist==1.34.0
pytest-timeout==2.1.0
pytest-xdist==2.5.0
python-dateutil==2.8.2
python-snappy==0.6.1
pytz==2022.1
Expand All @@ -146,12 +145,12 @@ tensorflow-io-gcs-filesystem==0.26.0
termcolor==1.1.0
testcontainers==3.6.0
threadpoolctl==3.1.0
tomli==2.0.1
tqdm==4.64.0
typing-utils==0.1.0
typing_extensions==4.3.0
uritemplate==4.1.1
urllib3==1.26.11
wcwidth==0.2.5
websocket-client==1.3.3
Werkzeug==2.2.1
wrapt==1.14.1
Expand Down
15 changes: 7 additions & 8 deletions sdks/python/container/py38/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

absl-py==1.2.0
astunparse==1.6.3
atomicwrites==1.4.1
attrs==21.4.0
attrs==22.1.0
beautifulsoup4==4.11.1
bs4==0.0.1
cachetools==4.2.4
Expand Down Expand Up @@ -83,6 +82,7 @@ hdfs==2.7.0
httplib2==0.20.4
idna==3.3
importlib-metadata==4.12.0
iniconfig==1.1.1
joblib==1.1.0
keras==2.9.0
Keras-Preprocessing==1.1.2
Expand All @@ -91,7 +91,6 @@ Markdown==3.4.1
MarkupSafe==2.1.1
mmh3==3.0.0
mock==2.0.0
more-itertools==8.13.0
nltk==3.7
nose==1.3.7
numpy==1.22.4
Expand All @@ -104,7 +103,7 @@ packaging==21.3
pandas==1.4.3
parameterized==0.8.1
pbr==5.9.0
pluggy==0.13.1
pluggy==1.0.0
proto-plus==1.20.6
protobuf==3.19.4
psycopg2-binary==2.9.3
Expand All @@ -118,10 +117,10 @@ PyHamcrest==1.10.1
pymongo==3.12.3
PyMySQL==1.0.2
pyparsing==3.0.9
pytest==4.6.11
pytest==7.1.2
pytest-forked==1.4.0
pytest-timeout==1.4.2
pytest-xdist==1.34.0
pytest-timeout==2.1.0
pytest-xdist==2.5.0
python-dateutil==2.8.2
python-snappy==0.6.1
pytz==2022.1
Expand All @@ -146,12 +145,12 @@ tensorflow-io-gcs-filesystem==0.26.0
termcolor==1.1.0
testcontainers==3.6.0
threadpoolctl==3.1.0
tomli==2.0.1
tqdm==4.64.0
typing-utils==0.1.0
typing_extensions==4.3.0
uritemplate==4.1.1
urllib3==1.26.11
wcwidth==0.2.5
websocket-client==1.3.3
Werkzeug==2.2.1
wrapt==1.14.1
Expand Down
15 changes: 7 additions & 8 deletions sdks/python/container/py39/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

absl-py==1.2.0
astunparse==1.6.3
atomicwrites==1.4.1
attrs==21.4.0
attrs==22.1.0
beautifulsoup4==4.11.1
bs4==0.0.1
cachetools==4.2.4
Expand Down Expand Up @@ -83,6 +82,7 @@ hdfs==2.7.0
httplib2==0.20.4
idna==3.3
importlib-metadata==4.12.0
iniconfig==1.1.1
joblib==1.1.0
keras==2.9.0
Keras-Preprocessing==1.1.2
Expand All @@ -91,7 +91,6 @@ Markdown==3.4.1
MarkupSafe==2.1.1
mmh3==3.0.0
mock==2.0.0
more-itertools==8.13.0
nltk==3.7
nose==1.3.7
numpy==1.22.4
Expand All @@ -104,7 +103,7 @@ packaging==21.3
pandas==1.4.3
parameterized==0.8.1
pbr==5.9.0
pluggy==0.13.1
pluggy==1.0.0
proto-plus==1.20.6
protobuf==3.19.4
psycopg2-binary==2.9.3
Expand All @@ -118,10 +117,10 @@ PyHamcrest==1.10.1
pymongo==3.12.3
PyMySQL==1.0.2
pyparsing==3.0.9
pytest==4.6.11
pytest==7.1.2
pytest-forked==1.4.0
pytest-timeout==1.4.2
pytest-xdist==1.34.0
pytest-timeout==2.1.0
pytest-xdist==2.5.0
python-dateutil==2.8.2
python-snappy==0.6.1
pytz==2022.1
Expand All @@ -146,12 +145,12 @@ tensorflow-io-gcs-filesystem==0.26.0
termcolor==1.1.0
testcontainers==3.6.0
threadpoolctl==3.1.0
tomli==2.0.1
tqdm==4.64.0
typing-utils==0.1.0
typing_extensions==4.3.0
uritemplate==4.1.1
urllib3==1.26.11
wcwidth==0.2.5
websocket-client==1.3.3
Werkzeug==2.2.1
wrapt==1.14.1
Expand Down
6 changes: 3 additions & 3 deletions sdks/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ def get_portability_package_data():
'pyyaml>=3.12,<7.0.0',
'requests_mock>=1.7,<2.0',
'tenacity>=5.0.2,<6.0',
'pytest>=4.4.0,<5.0',
'pytest-xdist>=1.29.0,<2',
'pytest-timeout>=1.3.3,<2',
'pytest>=7.1.2,<8.0',
'pytest-xdist>=2.5.0,<3',
'pytest-timeout>=2.1.0,<3',
'scikit-learn>=0.20.0',
'sqlalchemy>=1.3,<2.0',
'psycopg2-binary>=2.8.5,<3.0.0',
Expand Down
3 changes: 1 addition & 2 deletions sdks/python/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ commands =
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"

[testenv:py38-cloudcoverage]
# More recent versions of pytest-cov do not support pytest 4.4.0
deps =
codecov
pytest-cov==2.9.0
pytest-cov==3.0.0
passenv = GIT_* BUILD_* ghprb* CHANGE_ID BRANCH_NAME JENKINS_* CODECOV_*
extras = test,gcp,interactive,dataframe,aws
commands =
Expand Down