Skip to content

CI: clean azure pipeline #38636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4912eb1
CI: use conda from ci
Dec 22, 2020
80c751e
CI: use conda from ci
Dec 22, 2020
b0ff882
CI: use conda from ci
Dec 22, 2020
7e685e8
CI: use conda from ci
Dec 22, 2020
0371e8f
CI: use conda from ci
Dec 22, 2020
2fe866a
CI: use conda from ci
Dec 22, 2020
e54d80b
CI: use conda from ci
Dec 22, 2020
079bb27
CI: use conda from ci
Dec 22, 2020
bd1af56
CI: use conda from ci
Dec 22, 2020
f323354
CI: use conda from ci
Dec 22, 2020
7c29e8b
CI: use conda from ci
Dec 23, 2020
ea745b1
CI: use conda from ci
Dec 23, 2020
bc95cde
CI: use conda from ci
Dec 23, 2020
c78dc47
CI: use conda from ci
Dec 23, 2020
c2ee4a3
CI: use conda from ci
Dec 23, 2020
fdb081b
CI: use conda from ci
Dec 23, 2020
2be2ae7
CI: use conda from ci
Dec 23, 2020
1b50515
CI: use conda from ci
Dec 23, 2020
2a4285d
Merge remote-tracking branch 'upstream/master' into refactor-azure-ci
fangchenli Jun 11, 2021
37a287a
rebase
fangchenli Jun 11, 2021
fda6a84
fix build commend
fangchenli Jun 11, 2021
a7a01d8
fix env commend
fangchenli Jun 11, 2021
f0f9b47
fix env commend
fangchenli Jun 11, 2021
144c50d
fix env commend
fangchenli Jun 11, 2021
2c8813f
update vmimage version
fangchenli Jun 11, 2021
bde28ca
fix windows
fangchenli Jun 11, 2021
14b5cb7
fix windows
fangchenli Jun 11, 2021
61932dd
fix windows
fangchenli Jun 11, 2021
a92dbf6
str
fangchenli Jun 11, 2021
025d125
Merge remote-tracking branch 'upstream/master' into refactor-azure-ci
fangchenli Jun 12, 2021
8a61398
resolve conflict
fangchenli Jul 17, 2021
6f73e01
resolve conflict
fangchenli Jul 17, 2021
49cefe9
Merge remote-tracking branch 'upstream/master' into refactor-azure-ci
fangchenli Jul 17, 2021
2d32a50
resolve conflict
fangchenli Jul 17, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 7 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ name: CI

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

env:
ENV_FILE: environment.yml
Expand All @@ -22,10 +20,6 @@ jobs:
run:
shell: bash -l {0}

concurrency:
group: ${{ github.ref }}-checks
cancel-in-progress: ${{github.event_name == 'pull_request'}}

steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -99,12 +93,8 @@ jobs:
web_and_docs:
name: Web and docs
runs-on: ubuntu-latest

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

steps:

- name: Checkout
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -133,15 +123,15 @@ jobs:
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: github.event_name == 'push'

- name: Upload web
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' --exclude='Pandas_Cheat_Sheet*' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: github.event_name == 'push'

- name: Upload dev docs
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: github.event_name == 'push'

- name: Move docs into site directory
run: mv doc/build/html web/build/docs
Expand All @@ -158,11 +148,8 @@ jobs:
strategy:
matrix:
pattern: ["not slow and not network and not clipboard", "slow"]
concurrency:
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
cancel-in-progress: true

steps:

- name: Checkout
uses: actions/checkout@v2
with:
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ name: Database

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

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

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

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

concurrency:
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
cancel-in-progress: ${{github.event_name == 'pull_request'}}

services:
mysql:
image: mysql
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@ name: Posix

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

env:
PYTEST_WORKERS: "auto"
Expand All @@ -25,13 +21,14 @@ jobs:
strategy:
matrix:
settings: [
[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-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.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-39-slow.yaml, "slow", "", "", "", "", ""],
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
[actions-38-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 @@ -44,9 +41,6 @@ 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: ${{github.event_name == 'pull_request'}}

steps:
- name: Checkout
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@ name: pre-commit
on:
pull_request:
push:
branches:
- master
- 1.3.x
branches: [master]

jobs:
pre-commit:
runs-on: ubuntu-latest
concurrency:
group: ${{ github.ref }}-pre-commit
cancel-in-progress: ${{github.event_name == 'pull_request'}}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/python-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,16 @@ on:
push:
branches:
- master
- 1.3.x
pull_request:
branches:
- master
- 1.3.x
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: ${{github.event_name == 'pull_request'}}

steps:
- uses: actions/checkout@v2
with:
Expand All @@ -44,7 +30,7 @@ jobs:
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 install cython python-dateutil pytz hypothesis pytest-xdist
pip list

- name: Build Pandas
Expand All @@ -58,8 +44,7 @@ jobs:

- name: Test with pytest
run: |
ci/run_tests.sh
# GH 41935
coverage run -m pytest -m 'not slow and not network and not clipboard' pandas
continue-on-error: true

- name: Publish test results
Expand Down
67 changes: 0 additions & 67 deletions .github/workflows/sdist.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ repos:
- id: absolufy-imports
files: ^pandas/
- repo: https://github.com/python/black
rev: 21.6b0
rev: 21.5b2
hooks:
- id: black
- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
rev: v2.0.0
hooks:
- id: codespell
types_or: [python, rst, markdown]
Expand Down Expand Up @@ -53,16 +53,16 @@ repos:
types: [text]
args: [--append-config=flake8/cython-template.cfg]
- repo: https://github.com/PyCQA/isort
rev: 5.9.2
rev: 5.8.0
hooks:
- id: isort
- repo: https://github.com/asottile/pyupgrade
rev: v2.21.0
rev: v2.18.3
hooks:
- id: pyupgrade
args: [--py38-plus]
args: [--py37-plus]
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.8.0
hooks:
- id: rst-backticks
- id: rst-directive-colons
Expand Down
15 changes: 2 additions & 13 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@ global-exclude *.h5
global-exclude *.html
global-exclude *.json
global-exclude *.jsonl
global-exclude *.msgpack
global-exclude *.pdf
global-exclude *.pickle
global-exclude *.png
global-exclude *.pptx
global-exclude *.pyc
global-exclude *.pyd
global-exclude *.ods
global-exclude *.odt
global-exclude *.orc
global-exclude *.sas7bdat
global-exclude *.sav
global-exclude *.so
global-exclude *.xls
global-exclude *.xlsb
global-exclude *.xlsm
global-exclude *.xlsx
global-exclude *.xpt
Expand All @@ -40,13 +39,6 @@ global-exclude .DS_Store
global-exclude .git*
global-exclude \#*

global-exclude *.c
global-exclude *.cpp
global-exclude *.h

global-exclude *.py[ocd]
global-exclude *.pxi

# GH 39321
# csv_dir_path fixture checks the existence of the directory
# exclude the whole directory to avoid running related tests in sdist
Expand All @@ -55,6 +47,3 @@ prune pandas/tests/io/parser/data
include versioneer.py
include pandas/_version.py
include pandas/io/formats/templates/*.tpl

graft pandas/_libs/src
graft pandas/_libs/tslibs/src
Loading