Skip to content

Commit

Permalink
chore: use stable django versions for tests hosted on python-spanner-…
Browse files Browse the repository at this point in the history
…django (#772)
  • Loading branch information
ansh0l committed Jul 18, 2022
1 parent 7312906 commit 8cad6f6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/sync-repo-settings.yaml
Expand Up @@ -9,10 +9,6 @@ branchProtectionRules:
requiredStatusCheckContexts:
- 'cla/google'
- 'OwlBot Post Processor'
- 'system-tests (3.6)'
- 'system-tests (3.7)'
- 'system-tests (3.8)'
- 'system-tests (3.9)'
- 'system-tests'
- 'Kokoro'
permissionRules:
Expand Down
2 changes: 1 addition & 1 deletion django_test_suite.sh
Expand Up @@ -18,7 +18,7 @@ mkdir -p $DJANGO_TESTS_DIR
if [ $SPANNER_EMULATOR_HOST != 0 ]
then
pip3 install .
git clone --depth 1 --single-branch --branch "spanner/stable/2.2.x" https://github.com/c24t/django.git $DJANGO_TESTS_DIR/django
git clone --depth 1 --single-branch --branch "django/stable/2.2.x" https://github.com/googleapis/python-spanner-django.git $DJANGO_TESTS_DIR/django
fi

# Install dependencies for Django tests.
Expand Down
2 changes: 1 addition & 1 deletion django_test_suite_3.2.sh
Expand Up @@ -18,7 +18,7 @@ mkdir -p $DJANGO_TESTS_DIR
if [ $SPANNER_EMULATOR_HOST != 0 ]
then
pip3 install .
git clone --depth 1 --single-branch --branch "stable/spanner/3.2.x" https://github.com/vi3k6i5/django.git $DJANGO_TESTS_DIR/django3.2
git clone --depth 1 --single-branch --branch "django/stable/3.2.x" https://github.com/googleapis/python-spanner-django.git $DJANGO_TESTS_DIR/django3.2
fi

# Install dependencies for Django tests.
Expand Down
6 changes: 4 additions & 2 deletions noxfile.py
Expand Up @@ -181,7 +181,9 @@ def docs(session):
"""Build the docs for this library."""

session.install("-e", ".[tracing]")
session.install("sphinx", "alabaster", "recommonmark", "django==2.2")
session.install(
"sphinx==4.0.1", "alabaster", "recommonmark", "django==2.2"
)

shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
# Warnings as errors is disabled for `sphinx-build` because django module
Expand All @@ -205,7 +207,7 @@ def docfx(session):

session.install("-e", ".[tracing]")
session.install(
"sphinx",
"sphinx==4.0.1",
"alabaster",
"recommonmark",
"gcp-sphinx-docfx-yaml",
Expand Down

0 comments on commit 8cad6f6

Please sign in to comment.