From 1d3b3edf4174ada51a52b8a885eb69b08d2e9309 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 16:33:12 -0800 Subject: [PATCH 1/9] CircleCI check for sqlite --- .circleci/config.yml | 2 +- noxfile.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c490c04ef..cfb4e7e59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ jobs: name: Run tests - opencensus command: | pip install --upgrade nox - nox -f noxfile.py + nox -f noxfile.py -s sqlite_check - deploy: name: Push to PyPI (if this is a release tag). command: scripts/twine_upload.sh diff --git a/noxfile.py b/noxfile.py index 48e63b47b..8cb4b1bea 100644 --- a/noxfile.py +++ b/noxfile.py @@ -85,6 +85,11 @@ def unit(session): ) +@nox.session(python=['2.7', '3.4', '3.5', '3.6']) +def sqlite_check(session): + session.run('python', '-c', 'import sqlite3') + + @nox.session(python=['2.7', '3.6']) def system(session): """Run the system test suite.""" From d680561d3124650af371aec4be699f3c62cbd7cf Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 16:35:02 -0800 Subject: [PATCH 2/9] CircleCI check for sqlite with deps --- noxfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/noxfile.py b/noxfile.py index 8cb4b1bea..6af4edaa6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -87,6 +87,8 @@ def unit(session): @nox.session(python=['2.7', '3.4', '3.5', '3.6']) def sqlite_check(session): + _install_test_dependencies(session) + _install_dev_packages(session) session.run('python', '-c', 'import sqlite3') From c9aea0c8f1a0eec0c2477887a117fc0cf1375699 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 16:49:28 -0800 Subject: [PATCH 3/9] Try using circleci python container --- .circleci/config.yml | 2 +- noxfile.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cfb4e7e59..663d1faae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: ignore: - gh-pages docker: - - image: googleapis/nox:0.17.0 + - image: circleci/python:3.6.9 - image: mysql:5.7 environment: MYSQL_ROOT_HOST: "%" diff --git a/noxfile.py b/noxfile.py index 6af4edaa6..2229bcbaa 100644 --- a/noxfile.py +++ b/noxfile.py @@ -85,10 +85,10 @@ def unit(session): ) -@nox.session(python=['2.7', '3.4', '3.5', '3.6']) +@nox.session(python=['3.6']) def sqlite_check(session): - _install_test_dependencies(session) - _install_dev_packages(session) + # _install_test_dependencies(session) + # _install_dev_packages(session) session.run('python', '-c', 'import sqlite3') From c148ce8cb3493a3526102fdbcf15a3653c3aa8e0 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 16:52:03 -0800 Subject: [PATCH 4/9] Lose decrypt creds CI step --- .circleci/config.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 663d1faae..91b37063e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,16 +27,6 @@ jobs: steps: - checkout - - run: - name: Decrypt credentials - command: | - if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then - openssl aes-256-cbc -d -a -k "$GOOGLE_CREDENTIALS_PASSPHRASE" \ - -in tests/system/credentials.json.enc \ - -out $GOOGLE_APPLICATION_CREDENTIALS - else - echo "No credentials. System tests will not run." - fi - run: name: Run tests - opencensus command: | From c50f0792f50ca628b5d2eb3f64eefa0c26fd046e Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 16:57:35 -0800 Subject: [PATCH 5/9] Sudo it --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91b37063e..6a694df3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - run: name: Run tests - opencensus command: | - pip install --upgrade nox + sudo pip install --upgrade nox nox -f noxfile.py -s sqlite_check - deploy: name: Push to PyPI (if this is a release tag). From 2e46febf6892fd515aee918d636cef33675cd9ef Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 17:02:50 -0800 Subject: [PATCH 6/9] Try using googleapis/python-multi image --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6a694df3d..7614984ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: ignore: - gh-pages docker: - - image: circleci/python:3.6.9 + - image: googleapis/python-multi:latest - image: mysql:5.7 environment: MYSQL_ROOT_HOST: "%" @@ -30,7 +30,7 @@ jobs: - run: name: Run tests - opencensus command: | - sudo pip install --upgrade nox + pip install --upgrade nox nox -f noxfile.py -s sqlite_check - deploy: name: Push to PyPI (if this is a release tag). From 356ffc19518310226e22f50d62be37bd43624246 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 17:09:50 -0800 Subject: [PATCH 7/9] Try using nox latest image --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7614984ee..d4f392dee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: ignore: - gh-pages docker: - - image: googleapis/python-multi:latest + - image: googleapis/nox:latest - image: mysql:5.7 environment: MYSQL_ROOT_HOST: "%" @@ -31,6 +31,7 @@ jobs: name: Run tests - opencensus command: | pip install --upgrade nox + python -c "import sqlite3" nox -f noxfile.py -s sqlite_check - deploy: name: Push to PyPI (if this is a release tag). From 97dc740c4e643ca3068b19391debe0894b02cb3c Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 17:12:50 -0800 Subject: [PATCH 8/9] Double-check circleCI image --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4f392dee..e92cb166b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: ignore: - gh-pages docker: - - image: googleapis/nox:latest + - image: circleci/python:3.6.9 - image: mysql:5.7 environment: MYSQL_ROOT_HOST: "%" @@ -30,7 +30,7 @@ jobs: - run: name: Run tests - opencensus command: | - pip install --upgrade nox + sudo pip install --upgrade nox python -c "import sqlite3" nox -f noxfile.py -s sqlite_check - deploy: From da468850dedc18633710d9c9b125a1775643f0ff Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 14 Jan 2020 17:14:20 -0800 Subject: [PATCH 9/9] Try using wrong python version for circle image --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 2229bcbaa..a1de8f7fb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -85,7 +85,7 @@ def unit(session): ) -@nox.session(python=['3.6']) +@nox.session(python=['3.5', '3.6']) def sqlite_check(session): # _install_test_dependencies(session) # _install_dev_packages(session)