diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 97ca346142ec1..ee765d8c01e60 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -60,10 +60,6 @@ jobs: env_file: actions-310.yaml pattern: "not slow and not network and not single_cpu" pandas_copy_on_write: "1" - - name: "Data Manager" - env_file: actions-38.yaml - pattern: "not slow and not network and not single_cpu" - pandas_data_manager: "array" - name: "Pypy" env_file: actions-pypy-38.yaml pattern: "not slow and not network and not single_cpu" @@ -86,7 +82,6 @@ jobs: EXTRA_APT: ${{ matrix.extra_apt || '' }} LANG: ${{ matrix.lang || '' }} LC_ALL: ${{ matrix.lc_all || '' }} - PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }} PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }} PANDAS_CI: ${{ matrix.pandas_ci || '1' }} TEST_ARGS: ${{ matrix.test_args || '' }} @@ -97,7 +92,7 @@ jobs: COVERAGE: ${{ !contains(matrix.env_file, 'pypy') }} concurrency: # https://github.community/t/concurrecy-not-work-for-push/183068/7 - group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_data_manager || '' }} + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }} cancel-in-progress: true services: diff --git a/ci/run_tests.sh b/ci/run_tests.sh index e6de5caf955fc..3e79e5f60cba6 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -32,18 +32,3 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" - -if [[ "$PANDAS_DATA_MANAGER" != "array" && "$PYTEST_TARGET" == "pandas" ]]; then - # The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array - # If we're targeting specific files, e.g. test_downstream.py, don't run. - PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas" - - if [[ "$PATTERN" ]]; then - PYTEST_AM_CMD="$PYTEST_AM_CMD -m \"$PATTERN and arraymanager\"" - else - PYTEST_AM_CMD="$PYTEST_AM_CMD -m \"arraymanager\"" - fi - - echo $PYTEST_AM_CMD - sh -c "$PYTEST_AM_CMD" -fi