From 77aef76839383d812ea36129b58e0c8a07d1675e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 24 Feb 2022 19:57:39 -0800 Subject: [PATCH 1/3] CI: Merge datamanager job into posix --- .github/workflows/datamanger.yml | 54 -------------------------------- .github/workflows/posix.yml | 6 +++- 2 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 .github/workflows/datamanger.yml diff --git a/.github/workflows/datamanger.yml b/.github/workflows/datamanger.yml deleted file mode 100644 index d355bdec82443..0000000000000 --- a/.github/workflows/datamanger.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Data Manager - -on: - push: - branches: - - main - - 1.4.x - pull_request: - branches: - - main - - 1.4.x - paths-ignore: - - "doc/**" - -env: - ENV_FILE: environment.yml - PANDAS_CI: 1 - -jobs: - data_manager: - name: Test experimental data manager - runs-on: ubuntu-latest - timeout-minutes: 120 - services: - moto: - image: motoserver/moto - env: - AWS_ACCESS_KEY_ID: foobar_key - AWS_SECRET_ACCESS_KEY: foobar_secret - ports: - - 5000:5000 - concurrency: - # https://github.community/t/concurrecy-not-work-for-push/183068/7 - group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager - cancel-in-progress: true - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set up pandas - uses: ./.github/actions/setup - - - name: Run tests - env: - PANDAS_DATA_MANAGER: array - PATTERN: "not network and not clipboard and not single_cpu" - PYTEST_WORKERS: "auto" - PYTEST_TARGET: pandas - run: | - source activate pandas-dev - ci/run_tests.sh diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 97683e56915c6..c96f9aaaaf1c8 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,6 +45,9 @@ jobs: extra_apt: "language-pack-zh-hans" lang: "zh_CN.utf8" lc_all: "zh_CN.utf8" + - env_file: actions-38.yaml + pattern: "not slow and not network and not single_cpu" + pandas_data_manager: "array" - env_file: actions-pypy-38.yaml pattern: "not slow and not network and not single_cpu" test_args: "--max-worker-restart 0" @@ -60,6 +63,7 @@ jobs: LANG: ${{ matrix.lang || '' }} LC_ALL: ${{ matrix.lc_all || '' }} PANDAS_TESTING_MODE: ${{ matrix.pandas_testing_mode || '' }} + PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }} TEST_ARGS: ${{ matrix.test_args || '' }} PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }} PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }} @@ -68,7 +72,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.pyarrow_version || '' }}-${{ matrix.extra_apt || '' }} + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.pyarrow_version || '' }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_data_manager || '' }} cancel-in-progress: true services: From 99a8a7aabf43915e327a3f5cc02921209a3f4fc4 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 24 Feb 2022 22:04:26 -0800 Subject: [PATCH 2/3] Add better name --- .github/workflows/posix.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index c96f9aaaaf1c8..f4d605d4290c0 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -33,29 +33,37 @@ jobs: - env_file: actions-38-downstream_compat.yaml pattern: "not slow and not network and not single_cpu" pytest_target: "pandas/tests/test_downstream.py" + name: "Downstream Compat" - env_file: actions-38-minimum_versions.yaml pattern: "not slow and not network and not single_cpu" + name: "Minimum Versions" - env_file: actions-38.yaml pattern: "not slow and not network and not single_cpu" extra_apt: "language-pack-it" lang: "it_IT.utf8" lc_all: "it_IT.utf8" + name: "Locale: it_IT.utf8" - env_file: actions-38.yaml pattern: "not slow and not network and not single_cpu" extra_apt: "language-pack-zh-hans" lang: "zh_CN.utf8" lc_all: "zh_CN.utf8" + name: "Locale: zh_CN.utf8" - env_file: actions-38.yaml pattern: "not slow and not network and not single_cpu" pandas_data_manager: "array" + name: "Data Manager" - env_file: actions-pypy-38.yaml pattern: "not slow and not network and not single_cpu" test_args: "--max-worker-restart 0" + name: "Pypy" - env_file: actions-310-numpydev.yaml pattern: "not slow and not network and not single_cpu" pandas_testing_mode: "deprecate" test_args: "-W error" + name: "Numpy Dev" fail-fast: false + name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern)} env: ENV_FILE: ci/deps/${{ matrix.env_file }} PATTERN: ${{ matrix.pattern }} From f2ed1b1fd42aec206e9a2d29d73ceb3284c307cd Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 24 Feb 2022 22:11:41 -0800 Subject: [PATCH 3/3] Fix syntax --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index f4d605d4290c0..fe225add5bde7 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -63,7 +63,7 @@ jobs: test_args: "-W error" name: "Numpy Dev" fail-fast: false - name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern)} + name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }} env: ENV_FILE: ci/deps/${{ matrix.env_file }} PATTERN: ${{ matrix.pattern }}