Skip to content

Commit b882aad

Browse files
engelkeengelke
authored
Merge branch 'master' into renovate/docker-python-3.x
2 parents 9d05319 + f54f4f3 commit b882aad

File tree

103 files changed

+2275
-5826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2275
-5826
lines changed

‎.github/header-checker-lint.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{"allowedCopyrightHolders": [],
2+
"allowedLicenses": ["Apache-2.0", "MIT", "BSD-3"],
3+
"ignoreFiles": ["requirements.txt", "requirements-test.txt"],
4+
"sourceFileExtensions": [
5+
"ts",
6+
"js",
7+
"java",
8+
"sh",
9+
"Dockerfile",
10+
"yaml",
11+
"py",
12+
"html",
13+
"txt"
14+
]
15+
}

‎appengine/flexible/cloudsql/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==1.1.2
22
Flask-SQLAlchemy==2.4.4
33
gunicorn==20.0.4
4-
PyMySQL==0.10.1
4+
PyMySQL==1.0.2

‎appengine/flexible/datastore/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Flask==1.1.2
2-
google-cloud-datastore==2.0.1
2+
google-cloud-datastore==2.1.0
33
gunicorn==20.0.4

‎appengine/flexible/numpy/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Flask==1.1.2
22
gunicorn==20.0.4
3-
numpy==1.19.4
3+
numpy==1.19.5

‎appengine/flexible/pubsub/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Flask==1.1.2
2-
google-cloud-pubsub==1.7.0
2+
google-cloud-pubsub==2.2.0
33
gunicorn==20.0.4

‎appengine/flexible/scipy/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Flask==1.1.2
22
gunicorn==20.0.4
33
imageio==2.9.0
4-
numpy==1.19.4
5-
pillow==8.0.1
4+
numpy==1.19.5
5+
pillow==8.1.0
66
scipy==1.5.4

‎appengine/standard/django/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
PyMySQL==0.10.1
1+
PyMySQL==0.10.1; python_version < '3.0' # needs to stay under 1.0.0 for Python 2 support
22
Django==1.11.29; python_version < '3.0' # needs to stay under 2.0.0 for Python 2 support

‎appengine/standard/firebase/firenotes/backend/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Flask==1.1.2
22
pyjwt==1.7.1; python_version < '3.0'
3-
flask-cors==3.0.9
3+
flask-cors==3.0.10
44
google-auth==1.24.0
55
requests==2.25.1
66
requests-toolbelt==0.9.1

‎appengine/standard/i18n/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Move into this project directory and invoke the following command:
6060

6161
This command creates a `locales/messages.pot` file in the `locales`
6262
directory which contains all the string found in your Python code and
63-
Jija2 tempaltes.
63+
Jinja2 templates.
6464

6565
Since the babel configration file `main.mapping` contains a reference
6666
to `jinja2.ext.babel_extract` helper function which is provided by

‎appengine/standard/migration/taskqueue/counter/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Flask==1.1.2
2-
google-cloud-datastore==1.15.3
2+
google-cloud-datastore==2.1.0; python_version >= "3.0"
3+
google-cloud-datastore==1.15.3; python_version < "3.0"
34
google-cloud-tasks==2.0.0 ; python_version >= "3.0"
45
google-cloud-tasks==1.5.0 ; python_version < "3.0"

0 commit comments

Comments
 (0)