Skip to content

Commit

Permalink
Merge upstream/master as required pandas-dev#41283 was merged
Browse files Browse the repository at this point in the history
  • Loading branch information
pckSF committed Jul 11, 2021
2 parents 7bf21ec + 2499a76 commit cc24c9a
Show file tree
Hide file tree
Showing 744 changed files with 30,945 additions and 16,792 deletions.
32 changes: 25 additions & 7 deletions .github/workflows/ci.yml
Expand Up @@ -2,11 +2,12 @@ name: CI

on:
push:
branches: [master]
branches:
- master
pull_request:
branches:
- master
- 1.2.x
- 1.3.x

env:
ENV_FILE: environment.yml
Expand All @@ -20,9 +21,15 @@ jobs:
run:
shell: bash -l {0}

concurrency:
group: ${{ github.ref }}-checks
cancel-in-progress: true

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Looking for unwanted patterns
run: ci/code_checks.sh patterns
Expand Down Expand Up @@ -91,10 +98,16 @@ jobs:
web_and_docs:
name: Web and docs
runs-on: ubuntu-latest
steps:

concurrency:
group: ${{ github.ref }}-web-docs
cancel-in-progress: true

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up pandas
uses: ./.github/actions/setup
Expand Down Expand Up @@ -144,10 +157,15 @@ jobs:
strategy:
matrix:
pattern: ["not slow and not network and not clipboard", "slow"]
steps:
concurrency:
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
cancel-in-progress: true

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up pandas
uses: ./.github/actions/setup
Expand Down
23 changes: 16 additions & 7 deletions .github/workflows/database.yml
Expand Up @@ -2,11 +2,14 @@ name: Database

on:
push:
branches: [master]
branches:
- master
pull_request:
branches:
- master
- 1.2.x
- 1.3.x
paths-ignore:
- "doc/**"

env:
PYTEST_WORKERS: "auto"
Expand All @@ -15,17 +18,21 @@ env:
COVERAGE: true

jobs:
Linux_py37_IO:
Linux_py38_IO:
runs-on: ubuntu-latest
defaults:
run:
shell: bash -l {0}

strategy:
matrix:
ENV_FILE: [ci/deps/actions-37-db-min.yaml, ci/deps/actions-37-db.yaml]
ENV_FILE: [ci/deps/actions-38-db-min.yaml, ci/deps/actions-38-db.yaml]
fail-fast: false

concurrency:
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
cancel-in-progress: true

services:
mysql:
image: mysql
Expand Down Expand Up @@ -56,10 +63,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Cache conda
uses: actions/cache@v1
uses: actions/cache@v2
env:
CACHE_NUMBER: 0
with:
Expand All @@ -70,7 +79,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: pandas-dev
channel-priority: strict
channel-priority: flexible
environment-file: ${{ matrix.ENV_FILE }}
use-only-tar-bz2: true

Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/posix.yml
Expand Up @@ -2,11 +2,14 @@ name: Posix

on:
push:
branches: [master]
branches:
- master
pull_request:
branches:
- master
- 1.2.x
- 1.3.x
paths-ignore:
- "doc/**"

env:
PYTEST_WORKERS: "auto"
Expand All @@ -21,14 +24,13 @@ jobs:
strategy:
matrix:
settings: [
[actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-37-slow.yaml, "slow", "", "", "", "", ""],
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
[actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
[actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""]
]
fail-fast: false
Expand All @@ -41,13 +43,18 @@ jobs:
LC_ALL: ${{ matrix.settings[4] }}
PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
TEST_ARGS: ${{ matrix.settings[6] }}
concurrency:
group: ${{ github.ref }}-${{ matrix.settings[0] }}
cancel-in-progress: true

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Cache conda
uses: actions/cache@v1
uses: actions/cache@v2
env:
CACHE_NUMBER: 0
with:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pre-commit.yml
Expand Up @@ -3,11 +3,15 @@ name: pre-commit
on:
pull_request:
push:
branches: [master]
branches:
- master

jobs:
pre-commit:
runs-on: ubuntu-latest
concurrency:
group: ${{ github.ref }}-pre-commit
cancel-in-progress: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
84 changes: 84 additions & 0 deletions .github/workflows/python-dev.yml
@@ -0,0 +1,84 @@
name: Python Dev

on:
push:
branches:
- master
- 1.3.x
pull_request:
branches:
- master
paths-ignore:
- "doc/**"

env:
PYTEST_WORKERS: "auto"
PANDAS_CI: 1
PATTERN: "not slow and not network and not clipboard"
COVERAGE: true

jobs:
build:
runs-on: ubuntu-latest
name: actions-310-dev
timeout-minutes: 60

concurrency:
group: ${{ github.ref }}-dev
cancel-in-progress: true

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up Python Dev Version
uses: actions/setup-python@v2
with:
python-version: '3.10-dev'

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
pip install git+https://github.com/numpy/numpy.git
pip install git+https://github.com/pytest-dev/pytest.git
pip install git+https://github.com/nedbat/coveragepy.git
pip install cython python-dateutil pytz hypothesis pytest-xdist pytest-cov
pip list
- name: Build Pandas
run: |
python setup.py build_ext -q -j2
python -m pip install -e . --no-build-isolation --no-use-pep517
- name: Build Version
run: |
python -c "import pandas; pandas.show_versions();"
- name: Test with pytest
run: |
ci/run_tests.sh
# GH 41935
continue-on-error: true

- name: Publish test results
uses: actions/upload-artifact@master
with:
name: Test results
path: test-data.xml
if: failure()

- name: Print skipped tests
run: |
python ci/print_skipped.py
- name: Report Coverage
run: |
coverage report -m
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
flags: unittests
name: codecov-pandas
fail_ci_if_error: true
63 changes: 63 additions & 0 deletions .github/workflows/sdist.yml
@@ -0,0 +1,63 @@
name: sdist

on:
push:
branches:
- master
pull_request:
branches:
- master
- 1.3.x
paths-ignore:
- "doc/**"

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
defaults:
run:
shell: bash -l {0}

strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9"]

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
# GH 39416
pip install numpy
- name: Build pandas sdist
run: |
pip list
python setup.py sdist --formats=gztar
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: pandas-sdist
python-version: ${{ matrix.python-version }}

- name: Install pandas from sdist
run: |
conda list
python -m pip install dist/*.gz
- name: Import pandas
run: |
cd ..
conda list
python -c "import pandas; pandas.show_versions();"

0 comments on commit cc24c9a

Please sign in to comment.