From ffec7b501f6a19e3145a4b4cb16952a9c524590d Mon Sep 17 00:00:00 2001 From: Prakhar Gurunani Date: Tue, 1 Dec 2020 22:19:19 +0530 Subject: [PATCH 1/4] use conventionalcommits guidelines --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 8d7113079a..dbefeb8088 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -57,7 +57,7 @@ pip3 install . # Create a unique DJANGO_TESTS_DIR per worker to avoid # any clashes with configured tests by other workers. export DJANGO_TESTS_DIR="django_tests_$DJANGO_WORKER_INDEX" -mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django +mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/django/django.git $DJANGO_TESTS_DIR/django # Install dependencies for Django tests. sudo apt-get update From 7037db123ed61fcccb19800a3dc9e1f0e84da7fb Mon Sep 17 00:00:00 2001 From: Prakhar Gurunani Date: Tue, 1 Dec 2020 23:06:59 +0530 Subject: [PATCH 2/4] test: Use branch master of django/django --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index dbefeb8088..ad6879e0aa 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -57,7 +57,7 @@ pip3 install . # Create a unique DJANGO_TESTS_DIR per worker to avoid # any clashes with configured tests by other workers. export DJANGO_TESTS_DIR="django_tests_$DJANGO_WORKER_INDEX" -mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/django/django.git $DJANGO_TESTS_DIR/django +mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch master https://github.com/django/django.git $DJANGO_TESTS_DIR/django # Install dependencies for Django tests. sudo apt-get update From 5e2196e1b10a9a0edef12f2aa754a4efb4602569 Mon Sep 17 00:00:00 2001 From: Prakhar Gurunani Date: Tue, 1 Dec 2020 23:17:42 +0530 Subject: [PATCH 3/4] test: add commitlint.config.js --- commitlint.config.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 commitlint.config.js diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 0000000000..28fe5c5bf9 --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1 @@ +module.exports = {extends: ['@commitlint/config-conventional']} From 6a60d55a0a18b3b50543e0ca3f76cd5e4a528d27 Mon Sep 17 00:00:00 2001 From: Prakhar Gurunani Date: Tue, 1 Dec 2020 23:28:46 +0530 Subject: [PATCH 4/4] fix: setup venv --- .kokoro/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ad6879e0aa..9332fc1d84 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -36,6 +36,9 @@ python3.6 -m pip uninstall --yes --quiet nox-automation python3.6 -m pip install --upgrade --quiet nox python3.6 -m nox --version +python3.6 -m venv env +source env/bin/activate + # If NOX_SESSION is set, it only runs the specified session, # otherwise run all the sessions. if [[ -n "${NOX_SESSION:-}" ]]; then @@ -57,7 +60,7 @@ pip3 install . # Create a unique DJANGO_TESTS_DIR per worker to avoid # any clashes with configured tests by other workers. export DJANGO_TESTS_DIR="django_tests_$DJANGO_WORKER_INDEX" -mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch master https://github.com/django/django.git $DJANGO_TESTS_DIR/django +mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch stable/2.2.x https://github.com/django/django.git $DJANGO_TESTS_DIR/django # Install dependencies for Django tests. sudo apt-get update