Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit cf99c22

Browse filesBrowse files
crwilcoxleahecole
crwilcox
authored and
leahecole
committed
fix: Use different versions of pytest for python 2 and python3 (GoogleCloudPlatform#2558)
* fix: Use different versions of pytest for python 2 and python3 * fix: delete extra pytest dep * fix: update pytest dependencies in requirements.txt
1 parent f288566 commit cf99c22
Copy full SHA for cf99c22

File tree

Expand file treeCollapse file tree

6 files changed

+12
-6
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+12
-6
lines changed

‎container_registry/container_analysis/requirements.txt

Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
google-cloud-pubsub==1.0.0
22
google-cloud-containeranalysis==0.3.0
33
grafeas==0.1.0
4-
pytest==5.1.3
4+
pytest==5.3.0; python_version > "3.0"
5+
pytest==4.6.6; python_version < "3.0"
56
flaky==3.6.1
67
mock==3.0.5

‎functions/imagemagick/requirements-dev.txt

Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
mock==3.0.5
22
six==1.12.0
33
uuid==1.30
4-
pytest==5.1.3
4+
pytest==5.3.0; python_version > "3.0"
5+
pytest==4.6.6; python_version < "3.0"

‎run/image-processing/requirements.txt

Copy file name to clipboardExpand all lines: run/image-processing/requirements.txt
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Flask==1.1.1
2-
pytest==5.1.3
2+
pytest==5.3.0; python_version > "3.0"
3+
pytest==4.6.6; python_version < "3.0"
34
gunicorn==19.9.0
45
google-cloud-vision==0.39.0
56
google-cloud-storage==1.19.1

‎run/logging-manual/requirements.txt

Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Flask==1.1.1
2-
pytest==5.1.3
2+
pytest==5.3.0; python_version > "3.0"
3+
pytest==4.6.6; python_version < "3.0"
34
gunicorn==19.9.0

‎run/pubsub/requirements.txt

Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Flask==1.1.1
2-
pytest==5.1.3
2+
pytest==5.3.0; python_version > "3.0"
3+
pytest==4.6.6; python_version < "3.0"
34
gunicorn==19.9.0

‎testing/requirements.txt

Copy file name to clipboardExpand all lines: testing/requirements.txt
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ mock==3.0.5
66
mysql-python==1.2.5; python_version < "3.0"
77
PyCrypto==2.6.1
88
pytest-cov==2.8.1
9-
pytest==5.2.1
9+
pytest==5.3.0; python_version > "3.0"
10+
pytest==4.6.6; python_version < "3.0"
1011
pyyaml==5.1.2
1112
responses==0.10.6
1213
WebTest==2.0.33

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.