Skip to content

Commit 7af14f7

Browse files
chore(deps): update dependency django to v3.0.2 (GoogleCloudPlatform#2723)
* chore(deps): update dependency django to v3.0.2 * manually update django in some spots * fix test failures wrt psycopg2 * specify django for python2 * More python django version stuff * gunicorn python versionin * make appengine django cloudsql tests py3 only * pin django versions for python versions * fix error Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com>
1 parent 8215f45 commit 7af14f7

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
Django==3.0.1
1+
Django==3.0.2; python_version > '3.5'
2+
Django==2.2.9; python_version == '3.5'
23
# mysqlclient==1.4.1 # Uncomment this line if using MySQL
34
wheel==0.33.6
45
gunicorn==20.0.4
5-
psycopg2==2.8.4
6+
#psycopg2==2.8.4 # uncomment if you prefer to build from source
7+
psycopg2-binary==2.8.4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
Django==3.0.1
2-
gunicorn==20.0.4
1+
Django==3.0.2; python_version > '3.5'
2+
Django==2.2.9; python_version == '3.5'
3+
Django==1.11.27; python_version < '3.0'
4+
gunicorn==20.0.4; python_version > '3.0'
5+
gunicorn==19.10.0; python_version < '3.0'
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
Django==3.0.1
1+
Django==3.0.2; python_version > '3.5'
2+
Django==2.2.9; python_version == '3.5'
3+
Django==1.11.27;python_version < '3.0'
24
# Uncomment the mysqlclient requirement if you are using MySQL rather than
35
# PostgreSQL. You must also have a MySQL client installed in that case.
46
#mysqlclient==1.4.1
57
wheel==0.33.6
6-
gunicorn==20.0.4
7-
psycopg2==2.8.4
8+
gunicorn==20.0.4; python_version > '3.0'
9+
gunicorn==19.10.0; python_version < '3.0'
10+
# psycopg2==2.8.4 # uncomment if you prefer to build from source
11+
psycopg2-binary==2.8.4

noxfile-template.py

+3
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ def _setup_appengine_sdk(session):
146146
str(Path(sample).absolute().relative_to(REPO_ROOT)).startswith(
147147
"appengine/standard_python37"
148148
)
149+
or str(Path(sample).absolute().relative_to(REPO_ROOT)).startswith(
150+
"appengine/flexible/django_cloudsql"
151+
)
149152
or str(Path(sample).absolute().relative_to(REPO_ROOT)).startswith("functions/")
150153
or str(Path(sample).absolute().relative_to(REPO_ROOT)).startswith(
151154
"bigquery/pandas-gbq-migration"

0 commit comments

Comments
 (0)