From ad45c6d43f488472400947e3ad3bc4dda6c88500 Mon Sep 17 00:00:00 2001 From: aribray <45905583+aribray@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:26:43 -0500 Subject: [PATCH] test removing circleci --- .circleci/config.yml | 34 -------------------------------- .github/sync-repo-settings.yaml | 4 ++++ .kokoro/trampoline_v2.sh | 23 --------------------- ci/config_auth.sh | 13 ------------ ci/requirements-3.7-0.24.2.conda | 14 ------------- ci/requirements-3.9-1.3.4.conda | 14 ------------- ci/run_conda.sh | 23 --------------------- ci/run_tests.sh | 15 -------------- tests/system/test_auth.py | 2 +- 9 files changed, 5 insertions(+), 137 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100755 ci/config_auth.sh delete mode 100644 ci/requirements-3.7-0.24.2.conda delete mode 100644 ci/requirements-3.9-1.3.4.conda delete mode 100755 ci/run_conda.sh delete mode 100755 ci/run_tests.sh diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e008054c..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2017 pandas-gbq Authors All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -version: 2 -jobs: - # Conda - "conda-3.7": - docker: - - image: mambaorg/micromamba - environment: - PYTHON: "3.7" - PANDAS: "0.24.2" - steps: - - checkout - - run: ci/config_auth.sh - - run: ci/run_conda.sh - "conda-3.9": - docker: - - image: mambaorg/micromamba - environment: - PYTHON: "3.9" - PANDAS: "1.3.4" - steps: - - checkout - - run: ci/config_auth.sh - - run: ci/run_conda.sh - -workflows: - version: 2 - build: - jobs: - - "conda-3.7" - - "conda-3.9" diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 590dda51..e1e8137e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -15,6 +15,10 @@ branchProtectionRules: - 'unit (3.8)' - 'unit (3.9)' - 'unit (3.10)' + - 'system (3.7)' + - 'system (3.8)' + - 'system (3.9)' + - 'system (3.10)' - 'cover' - 'Kokoro' - 'Samples - Lint' diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh index 40a005c9..f7b6ba86 100755 --- a/.kokoro/trampoline_v2.sh +++ b/.kokoro/trampoline_v2.sh @@ -203,29 +203,6 @@ elif [[ -n "${GITHUB_RUN_ID:-}" ]]; then "GITHUB_HEAD_REF" "GITHUB_BASE_REF" ) -# elif [[ "${CIRCLECI:-}" == "true" ]]; then -# RUNNING_IN_CI="true" -# TRAMPOLINE_CI="circleci" -# pass_down_envvars+=( -# "CIRCLE_BRANCH" -# "CIRCLE_BUILD_NUM" -# "CIRCLE_BUILD_URL" -# "CIRCLE_COMPARE_URL" -# "CIRCLE_JOB" -# "CIRCLE_NODE_INDEX" -# "CIRCLE_NODE_TOTAL" -# "CIRCLE_PREVIOUS_BUILD_NUM" -# "CIRCLE_PROJECT_REPONAME" -# "CIRCLE_PROJECT_USERNAME" -# "CIRCLE_REPOSITORY_URL" -# "CIRCLE_SHA1" -# "CIRCLE_STAGE" -# "CIRCLE_USERNAME" -# "CIRCLE_WORKFLOW_ID" -# "CIRCLE_WORKFLOW_JOB_ID" -# "CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS" -# "CIRCLE_WORKFLOW_WORKSPACE_ID" -# ) fi # Configure the service account for pulling the docker image. diff --git a/ci/config_auth.sh b/ci/config_auth.sh deleted file mode 100755 index cde115c7..00000000 --- a/ci/config_auth.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# Copyright (c) 2017 pandas-gbq Authors All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -set -e -# Don't set -x, because we don't want to leak keys. -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" - -# Write key to file if present. -if [ ! -z "$SERVICE_ACCOUNT_KEY" ] ; then - echo "$SERVICE_ACCOUNT_KEY" | base64 --decode > "$DIR"/service_account.json -fi diff --git a/ci/requirements-3.7-0.24.2.conda b/ci/requirements-3.7-0.24.2.conda deleted file mode 100644 index bdc162be..00000000 --- a/ci/requirements-3.7-0.24.2.conda +++ /dev/null @@ -1,14 +0,0 @@ -codecov -coverage -db-dtypes==0.3.1 -fastavro -flake8 -freezegun -numpy==1.16.6 -google-cloud-bigquery==3.3.5 -google-cloud-bigquery-storage==2.16.2 -pyarrow==3.0.0 -pydata-google-auth -pytest -pytest-cov -tqdm==4.23.0 diff --git a/ci/requirements-3.9-1.3.4.conda b/ci/requirements-3.9-1.3.4.conda deleted file mode 100644 index 1411fe5b..00000000 --- a/ci/requirements-3.9-1.3.4.conda +++ /dev/null @@ -1,14 +0,0 @@ -codecov -coverage -db-dtypes -fastavro -flake8 -freezegun -google-cloud-bigquery -google-cloud-bigquery-storage -numpy -pyarrow -pydata-google-auth -pytest -pytest-cov -tqdm diff --git a/ci/run_conda.sh b/ci/run_conda.sh deleted file mode 100755 index 11b5b569..00000000 --- a/ci/run_conda.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright (c) 2017 pandas-gbq Authors All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -set -e -x -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" - -eval "$(micromamba shell hook --shell=bash)" -micromamba activate - -# Install dependencies using (micro)mamba -# https://github.com/mamba-org/micromamba-docker -REQ="ci/requirements-${PYTHON}-${PANDAS}" -micromamba install -q pandas=$PANDAS python=${PYTHON} -c conda-forge; -micromamba install -q --file "$REQ.conda" -c conda-forge; -micromamba list -micromamba info - -python setup.py develop --no-deps - -# Run the tests -$DIR/run_tests.sh diff --git a/ci/run_tests.sh b/ci/run_tests.sh deleted file mode 100755 index 8a1d7f91..00000000 --- a/ci/run_tests.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright (c) 2017 pandas-gbq Authors All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -set -e -x -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" - -if [ -f "$DIR/service_account.json" ]; then - export GOOGLE_APPLICATION_CREDENTIALS="$DIR/service_account.json" -fi - -# Install test requirements -pip install coverage pytest pytest-cov flake8 codecov google-cloud-testutils -pytest -v -m "not local_auth" --cov=pandas_gbq --cov-report xml:/tmp/pytest-cov.xml --cov-fail-under=0 tests diff --git a/tests/system/test_auth.py b/tests/system/test_auth.py index d9f7d096..ec2650f8 100644 --- a/tests/system/test_auth.py +++ b/tests/system/test_auth.py @@ -12,7 +12,7 @@ from pandas_gbq import auth -IS_RUNNING_ON_CI = "CIRCLE_BUILD_NUM" in os.environ or "KOKORO_BUILD_ID" in os.environ +"KOKORO_BUILD_ID" in os.environ def mock_default_credentials(scopes=None, request=None):