Skip to content

Commit 3ea0779

Browse files
authored
Merge branch 'main' into add-recommended-dependencies-as-extras_require-in-setup.cfg
2 parents 80842b1 + 74f4e81 commit 3ea0779

File tree

387 files changed

+12322
-3502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+12322
-3502
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/SECURITY.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/actions/build_pandas/action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ runs:
66

77
- name: Environment Detail
88
run: |
9-
conda info
10-
conda list
9+
micromamba info
10+
micromamba list
1111
shell: bash -el {0}
1212

1313
- name: Build Pandas
@@ -17,4 +17,6 @@ runs:
1717
shell: bash -el {0}
1818
env:
1919
# Cannot use parallel compilation on Windows, see https://github.com/pandas-dev/pandas/issues/30873
20-
N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}
20+
# GH 47305: Parallel build causes flaky ImportError: /home/runner/work/pandas/pandas/pandas/_libs/tslibs/timestamps.cpython-38-x86_64-linux-gnu.so: undefined symbol: pandas_datetime_to_datetimestruct
21+
N_JOBS: 1
22+
#N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Run tests and report results
2+
runs:
3+
using: composite
4+
steps:
5+
- name: Test
6+
run: ci/run_tests.sh
7+
shell: bash -el {0}
8+
9+
- name: Publish test results
10+
uses: actions/upload-artifact@v2
11+
with:
12+
name: Test results
13+
path: test-data.xml
14+
if: failure()
15+
16+
- name: Report Coverage
17+
run: coverage report -m
18+
shell: bash -el {0}
19+
if: failure()
20+
21+
- name: Upload coverage to Codecov
22+
uses: codecov/codecov-action@v2
23+
with:
24+
flags: unittests
25+
name: codecov-pandas
26+
fail_ci_if_error: false
27+
if: failure()

.github/actions/setup-conda/action.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ inputs:
66
environment-name:
77
description: Name to use for the Conda environment
88
default: test
9-
python-version:
10-
description: Python version to install
9+
extra-specs:
10+
description: Extra packages to install
1111
required: false
1212
pyarrow-version:
1313
description: If set, overrides the PyArrow version in the Conda environment to the given string.
@@ -24,14 +24,13 @@ runs:
2424
if: ${{ inputs.pyarrow-version }}
2525

2626
- name: Install ${{ inputs.environment-file }}
27-
uses: conda-incubator/setup-miniconda@v2.1.1
27+
uses: mamba-org/provision-with-micromamba@v12
2828
with:
2929
environment-file: ${{ inputs.environment-file }}
30-
activate-environment: ${{ inputs.environment-name }}
31-
python-version: ${{ inputs.python-version }}
32-
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
30+
environment-name: ${{ inputs.environment-name }}
31+
extra-specs: ${{ inputs.extra-specs }}
3332
channels: conda-forge
34-
mamba-version: "0.24"
35-
use-mamba: true
36-
use-only-tar-bz2: true
33+
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
3734
condarc-file: ci/condarc.yml
35+
cache-env: true
36+
cache-downloads: true

.github/workflows/32-bit-linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
paths-ignore:
1313
- "doc/**"
1414

15+
permissions:
16+
contents: read
17+
1518
jobs:
1619
pytest:
1720
runs-on: ubuntu-latest

.github/workflows/assign.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ on:
33
issue_comment:
44
types: created
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
issue_assign:
11+
permissions:
12+
issues: write
13+
pull-requests: write
814
runs-on: ubuntu-latest
915
steps:
1016
- if: github.event.comment.body == 'take'

.github/workflows/asv-bot.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,15 @@ env:
99
ENV_FILE: environment.yml
1010
COMMENT: ${{github.event.comment.body}}
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
autotune:
17+
permissions:
18+
contents: read
19+
issues: write
20+
pull-requests: write
1421
name: "Run benchmarks"
1522
# TODO: Support more benchmarking options later, against different branches, against self, etc
1623
if: startsWith(github.event.comment.body, '@github-actions benchmark')
@@ -33,12 +40,6 @@ jobs:
3340
with:
3441
fetch-depth: 0
3542

36-
- name: Cache conda
37-
uses: actions/cache@v3
38-
with:
39-
path: ~/conda_pkgs_dir
40-
key: ${{ runner.os }}-conda-${{ hashFiles('${{ env.ENV_FILE }}') }}
41-
4243
# Although asv sets up its own env, deps are still needed
4344
# during discovery process
4445
- name: Set up Conda

0 commit comments

Comments
 (0)