simplify aio ci set

snowflakedb · Sep 28, 2024 · c5fda89 · c5fda89
1 parent 4cc2f21
commit c5fda89
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -378,7 +378,7 @@ jobs:
       - name: Install tox
         run: python -m pip install tox>=4
       - name: Run tests
-        run: python -m tox run -e `echo py${PYTHON_VERSION/\./}-aio-ci`
+        run: python -m tox run -e aio
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
           cloud_provider: ${{ matrix.cloud-provider }}

diff --git a/test/integ/aio/pandas_aio/__init__.py → test/integ/aio/__init__.py b/test/integ/aio/pandas_aio/__init__.py → test/integ/aio/__init__.py
diff --git a/test/integ/aio/pandas/__init__.py b/test/integ/aio/pandas/__init__.py
@@ -0,0 +1,3 @@
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+#
diff --git a/...as_aio/test_arrow_chunk_iterator_async.py → ...pandas/test_arrow_chunk_iterator_async.py b/...as_aio/test_arrow_chunk_iterator_async.py → ...pandas/test_arrow_chunk_iterator_async.py
diff --git a/...aio/pandas_aio/test_arrow_pandas_async.py → ...teg/aio/pandas/test_arrow_pandas_async.py b/...aio/pandas_aio/test_arrow_pandas_async.py → ...teg/aio/pandas/test_arrow_pandas_async.py
diff --git a/...nteg/aio/pandas_aio/test_logging_async.py → test/integ/aio/pandas/test_logging_async.py b/...nteg/aio/pandas_aio/test_logging_async.py → test/integ/aio/pandas/test_logging_async.py
diff --git a/tox.ini b/tox.ini
@@ -28,9 +28,6 @@ extras =
     development
     pandas: pandas
     sso: secure-local-storage
-    aio:
-        aio
-        pandas
 package = wheel
 setenv =
     COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}}
@@ -41,7 +38,6 @@ setenv =
     !unit-!integ: SNOWFLAKE_TEST_TYPE = (unit or integ)
     unit: SNOWFLAKE_TEST_TYPE = unit and not aio
     integ: SNOWFLAKE_TEST_TYPE = integ and not aio
-    aio: SNOWFLAKE_TEST_TYPE = aio and pandas_aio
     parallel: SNOWFLAKE_PYTEST_OPTS = {env:SNOWFLAKE_PYTEST_OPTS:} -n auto
     # Add common parts into pytest command
     SNOWFLAKE_PYTEST_COV_LOCATION = {env:JUNIT_REPORT_DIR:{toxworkdir}}/junit.{envname}-{env:cloud_provider:dev}.xml
@@ -65,12 +61,11 @@ passenv =
 commands =
     # Test environments
     # Note: make sure to have a default env and all the other special ones
-    !pandas-!sso-!lambda-!extras-!aio: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and not sso and not pandas and not lambda and not aio" {posargs:} test
+    !pandas-!sso-!lambda-!extras: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and not sso and not pandas and not lambda" {posargs:} test
     pandas: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and pandas" {posargs:} test
     sso: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and sso" {posargs:} test
     lambda: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and lambda" {posargs:} test
     extras: python -m test.extras.run {posargs:}
-    aio: {env:SNOWFLAKE_PYTEST_CMD} -m "{env:SNOWFLAKE_TEST_TYPE}" {posargs:} test
 
 [testenv:olddriver]
 basepython = python3.8
@@ -103,6 +98,14 @@ commands =
     pip install .
     python -c 'import snowflake.connector.result_batch'
 
+[testenv:aio]
+description = Run aio tests
+extras=
+    development
+    aio
+    pandas
+commands = {env:SNOWFLAKE_PYTEST_CMD} -m "aio" -vvv {posargs:} test
+
 [testenv:coverage]
 description = [run locally after tests]: combine coverage data and create report
 ;              generates a diff coverage against origin/master (can be changed by setting DIFF_AGAINST env var)