From 784f21192c920f0954b0009ac83ec553a810a03b Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 1 Jul 2020 15:04:01 -0500 Subject: [PATCH] TST: update gbq service account key Re-enable gbq integration tests. --- ci/travis_encrypt_gbq.sh | 2 +- ci/travis_gbq.json.enc | Bin 2352 -> 2352 bytes ci/travis_gbq_config.txt | 4 ++-- ci/travis_process_gbq_encryption.sh | 2 +- pandas/tests/io/test_gbq.py | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/travis_encrypt_gbq.sh b/ci/travis_encrypt_gbq.sh index e404ca73a405e..7d5692d9520af 100755 --- a/ci/travis_encrypt_gbq.sh +++ b/ci/travis_encrypt_gbq.sh @@ -19,7 +19,7 @@ if [[ ! -f $GBQ_JSON_FILE ]]; then fi echo "Encrypting $GBQ_JSON_FILE..." -read -d "\n" TRAVIS_KEY TRAVIS_IV <<<$(travis encrypt-file $GBQ_JSON_FILE \ +read -d "\n" TRAVIS_KEY TRAVIS_IV <<<$(travis encrypt-file -r pandas-dev/pandas $GBQ_JSON_FILE \ travis_gbq.json.enc -f | grep -o "\w*_iv\|\w*_key"); echo "Adding your secure key to travis_gbq_config.txt ..." diff --git a/ci/travis_gbq.json.enc b/ci/travis_gbq.json.enc index c2a33bbd6f26383bd7e8a7a504e626284efb5fd0..6e0b6cee4048c70f9073dcdd75ed5008f2792c3e 100644 GIT binary patch literal 2352 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 Wjonm%xU9sD!uKl)As^5BMSjuVmYSFV literal 2352 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 Wc%~RC+CiWM`BrrE1b(~# diff --git a/ci/travis_gbq_config.txt b/ci/travis_gbq_config.txt index 0b28cdedbd0d7..dc857c450331c 100644 --- a/ci/travis_gbq_config.txt +++ b/ci/travis_gbq_config.txt @@ -1,2 +1,2 @@ -TRAVIS_IV_ENV=encrypted_1d9d7b1f171b_iv -TRAVIS_KEY_ENV=encrypted_1d9d7b1f171b_key +TRAVIS_IV_ENV=encrypted_e05c934e101e_iv +TRAVIS_KEY_ENV=encrypted_e05c934e101e_key diff --git a/ci/travis_process_gbq_encryption.sh b/ci/travis_process_gbq_encryption.sh index 9967d40e49f0a..fccf8e1e8deff 100755 --- a/ci/travis_process_gbq_encryption.sh +++ b/ci/travis_process_gbq_encryption.sh @@ -7,7 +7,7 @@ if [[ -n ${SERVICE_ACCOUNT_KEY} ]]; then elif [[ -n ${!TRAVIS_IV_ENV} ]]; then openssl aes-256-cbc -K ${!TRAVIS_KEY_ENV} -iv ${!TRAVIS_IV_ENV} \ -in ci/travis_gbq.json.enc -out ci/travis_gbq.json -d; - export GBQ_PROJECT_ID='pandas-travis'; + export GBQ_PROJECT_ID='pandas-gbq-tests'; echo 'Successfully decrypted gbq credentials' fi diff --git a/pandas/tests/io/test_gbq.py b/pandas/tests/io/test_gbq.py index 870d78ef1c533..df107259d38cd 100644 --- a/pandas/tests/io/test_gbq.py +++ b/pandas/tests/io/test_gbq.py @@ -148,7 +148,6 @@ def mock_read_gbq(sql, **kwargs): @pytest.mark.single -@pytest.mark.xfail(reason="skipping gbq integration for now, xref #34779") class TestToGBQIntegrationWithServiceAccountKeyPath: @pytest.fixture() def gbq_dataset(self):