From 2a31536d944cd4577e1680af8c2a279f18547a41 Mon Sep 17 00:00:00 2001 From: Adam Ling Date: Tue, 22 Aug 2023 14:23:45 -0700 Subject: [PATCH 1/2] update submodule --- tests/connector_regression | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/connector_regression b/tests/connector_regression index 6c365ab5..20f1efb5 160000 --- a/tests/connector_regression +++ b/tests/connector_regression @@ -1 +1 @@ -Subproject commit 6c365ab5e4d11621e78194c723b45528eaa807e2 +Subproject commit 20f1efb54ba07f2ee2e632dbc017c7d3807a2554 From 449dae6d0048555b5bbc44f68650cc80e6ab76f5 Mon Sep 17 00:00:00 2001 From: Adam Ling Date: Tue, 22 Aug 2023 16:05:31 -0700 Subject: [PATCH 2/2] remove submodule and connector regression test --- .github/workflows/build_test.yml | 43 +------------------------------- .gitmodules | 3 --- tests/connector_regression | 1 - tox.ini | 10 +------- 4 files changed, 2 insertions(+), 55 deletions(-) delete mode 160000 tests/connector_regression diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 9c648c73..eae3afe3 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -97,51 +97,10 @@ jobs: .tox/.coverage .tox/coverage.xml - test_connector_regression: - name: Connector Regression Test ${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }} - needs: lint - runs-on: ${{ matrix.os.image_name }} - strategy: - fail-fast: false - matrix: - os: - - image_name: ubuntu-latest - download_name: manylinux_x86_64 - python-version: ["3.8"] - cloud-provider: [aws] - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Display Python version - run: python -c "import sys; print(sys.version)" - - name: Setup parameters file - shell: bash - env: - PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }} - run: | - gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \ - .github/workflows/parameters/parameters_${{ matrix.cloud-provider }}.py.gpg > tests/connector_regression/test/parameters.py - - name: Upgrade setuptools, pip and wheel - run: python -m pip install -U setuptools pip wheel - - name: Install tox - run: python -m pip install tox - - name: List installed packages - run: python -m pip freeze - - name: Run tests - run: python -m tox -e connector_regression --skip-missing-interpreters false - env: - PYTEST_ADDOPTS: -vvv --color=yes --tb=short - TOX_PARALLEL_NO_SPINNER: 1 - combine-coverage: if: ${{ success() || failure() }} name: Combine coverage - needs: [test, test_connector_regression] + needs: [test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.gitmodules b/.gitmodules index 6f8702e6..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "tests/connector_regression"] - path = tests/connector_regression - url = git@github.com:snowflakedb/snowflake-connector-python diff --git a/tests/connector_regression b/tests/connector_regression deleted file mode 160000 index 20f1efb5..00000000 --- a/tests/connector_regression +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20f1efb54ba07f2ee2e632dbc017c7d3807a2554 diff --git a/tox.ini b/tox.ini index 99891d22..0c1cb483 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ min_version = 4.0.0 envlist = fix_lint, py{37,38,39,310,311}{,-pandas}, coverage, - connector_regression skip_missing_interpreters = true [testenv] @@ -52,13 +51,6 @@ commands = pytest \ --run_v20_sqlalchemy \ {posargs:tests} -[testenv:connector_regression] -deps = pendulum -commands = pytest \ - {env:SNOWFLAKE_PYTEST_OPTS:} \ - -m "not gcp and not azure" \ - {posargs:tests/connector_regression/test} - [testenv:.pkg_external] deps = build package_glob = {toxinidir}{/}dist{/}*.whl @@ -94,7 +86,7 @@ commands = pre-commit run --all-files python -c 'import pathlib; print("hint: run \{\} install to add checks as pre-commit hook".format(pathlib.Path(r"{envdir}") / "bin" / "pre-commit"))' [pytest] -addopts = -ra --strict-markers --ignore=tests/sqlalchemy_test_suite --ignore=tests/connector_regression +addopts = -ra --strict-markers --ignore=tests/sqlalchemy_test_suite junit_family = legacy log_level = info markers =