Skip to content

Commit eff487f

Browse files
jonashaagjonashaag
committed
Squash
1 parent b76e708 commit eff487f

14 files changed

+107
-97
lines changed

‎.circleci/config.yml

-21
This file was deleted.

‎.github/workflows/assign.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
issue_assign:
88
runs-on: ubuntu-latest
99
steps:
10+
- run: false
1011
- if: github.event.comment.body == 'take'
1112
run: |
1213
echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"

‎.github/workflows/asv-bot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
cancel-in-progress: false
2828

2929
steps:
30+
- run: false
3031
- name: Checkout
3132
uses: actions/checkout@v2
3233
with:

‎.github/workflows/autoupdate-pre-commit-config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
name: Autoupdate pre-commit config
1212
runs-on: ubuntu-latest
1313
steps:
14+
- run: false
1415
- name: Set up Python
1516
uses: actions/setup-python@v2
1617
- name: Cache multiple paths

‎.github/workflows/code-checks.yml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-pre-commit
2323
cancel-in-progress: true
2424
steps:
25+
- run: false
2526
- name: Checkout
2627
uses: actions/checkout@v2
2728

@@ -46,6 +47,7 @@ jobs:
4647
cancel-in-progress: true
4748

4849
steps:
50+
- run: false
4951
- name: Checkout
5052
uses: actions/checkout@v2
5153
with:
@@ -101,6 +103,7 @@ jobs:
101103
cancel-in-progress: true
102104

103105
steps:
106+
- run: false
104107
- name: Checkout
105108
uses: actions/checkout@v2
106109
with:
@@ -144,6 +147,7 @@ jobs:
144147
cancel-in-progress: true
145148

146149
steps:
150+
- run: false
147151
- name: Clean up dangling images
148152
run: docker image prune -f
149153

‎.github/workflows/comment_bot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
if: startsWith(github.event.comment.body, '@github-actions pre-commit')
1313
runs-on: ubuntu-latest
1414
steps:
15+
- run: false
1516
- uses: actions/checkout@v2
1617
- uses: r-lib/actions/pr-fetch@v2
1718
with:

‎.github/workflows/docbuild-and-upload.yml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
cancel-in-progress: true
2828

2929
steps:
30+
- run: false
3031
- name: Checkout
3132
uses: actions/checkout@v2
3233
with:

‎.github/workflows/posix.yml

+1-35
Original file line numberDiff line numberDiff line change
@@ -84,43 +84,9 @@ jobs:
8484
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 || '' }}
8585
cancel-in-progress: true
8686

87-
services:
88-
mysql:
89-
image: mysql
90-
env:
91-
MYSQL_ALLOW_EMPTY_PASSWORD: yes
92-
MYSQL_DATABASE: pandas
93-
options: >-
94-
--health-cmd "mysqladmin ping"
95-
--health-interval 10s
96-
--health-timeout 5s
97-
--health-retries 5
98-
ports:
99-
- 3306:3306
100-
101-
postgres:
102-
image: postgres
103-
env:
104-
POSTGRES_USER: postgres
105-
POSTGRES_PASSWORD: postgres
106-
POSTGRES_DB: pandas
107-
options: >-
108-
--health-cmd pg_isready
109-
--health-interval 10s
110-
--health-timeout 5s
111-
--health-retries 5
112-
ports:
113-
- 5432:5432
114-
115-
moto:
116-
image: motoserver/moto
117-
env:
118-
AWS_ACCESS_KEY_ID: foobar_key
119-
AWS_SECRET_ACCESS_KEY: foobar_secret
120-
ports:
121-
- 5000:5000
12287

12388
steps:
89+
- run: false
12490
- name: Checkout
12591
uses: actions/checkout@v2
12692
with:

‎.github/workflows/python-dev.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
cancel-in-progress: true
4646

4747
steps:
48+
- run: false
4849
- uses: actions/checkout@v2
4950
with:
5051
fetch-depth: 0

‎.github/workflows/sdist.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
cancel-in-progress: true
3333

3434
steps:
35+
- run: false
3536
- uses: actions/checkout@v2
3637
with:
3738
fetch-depth: 0

‎azure-pipelines.yml

+27-27
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,33 @@ jobs:
2727
name: macOS
2828
vmImage: macOS-10.15
2929

30-
- template: ci/azure/windows.yml
31-
parameters:
32-
name: Windows
33-
vmImage: windows-2019
30+
# - template: ci/azure/windows.yml
31+
# parameters:
32+
# name: Windows
33+
# vmImage: windows-2019
3434

35-
- job: py38_32bit
36-
pool:
37-
vmImage: ubuntu-18.04
35+
# - job: py38_32bit
36+
# pool:
37+
# vmImage: ubuntu-18.04
3838

39-
steps:
40-
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
41-
- script: |
42-
docker pull quay.io/pypa/manylinux2014_i686
43-
docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
44-
/bin/bash -xc "cd pandas && \
45-
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
46-
. ~/virtualenvs/pandas-dev/bin/activate && \
47-
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
48-
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
49-
python setup.py build_ext -q -j2 && \
50-
python -m pip install --no-build-isolation -e . && \
51-
pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml"
52-
displayName: 'Run 32-bit manylinux2014 Docker Build / Tests'
39+
# steps:
40+
# # TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
41+
# - script: |
42+
# docker pull quay.io/pypa/manylinux2014_i686
43+
# docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
44+
# /bin/bash -xc "cd pandas && \
45+
# /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
46+
# . ~/virtualenvs/pandas-dev/bin/activate && \
47+
# python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
48+
# pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
49+
# python setup.py build_ext -q -j2 && \
50+
# python -m pip install --no-build-isolation -e . && \
51+
# pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml"
52+
# displayName: 'Run 32-bit manylinux2014 Docker Build / Tests'
5353

54-
- task: PublishTestResults@2
55-
condition: succeededOrFailed()
56-
inputs:
57-
testResultsFiles: '**/test-*.xml'
58-
failTaskOnFailedTests: true
59-
testRunTitle: 'Publish test results for Python 3.8-32 bit full Linux'
54+
# - task: PublishTestResults@2
55+
# condition: succeededOrFailed()
56+
# inputs:
57+
# testResultsFiles: '**/test-*.xml'
58+
# failTaskOnFailedTests: true
59+
# testRunTitle: 'Publish test results for Python 3.8-32 bit full Linux'

‎ci/azure/posix.yml

+63-11
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,87 @@ jobs:
99
vmImage: ${{ parameters.vmImage }}
1010
strategy:
1111
matrix:
12-
py38:
13-
ENV_FILE: ci/deps/actions-38.yaml
14-
CONDA_PY: "38"
12+
# py38:
13+
# ENV_FILE: ci/deps/actions-38.yaml
14+
# CONDA_PY: "38"
1515

16-
py39:
17-
ENV_FILE: ci/deps/actions-39.yaml
18-
CONDA_PY: "39"
16+
# py39:
17+
# ENV_FILE: ci/deps/actions-39.yaml
18+
# CONDA_PY: "39"
1919

2020
py310:
2121
ENV_FILE: ci/deps/actions-310.yaml
2222
CONDA_PY: "310"
2323

2424
steps:
25-
- script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
26-
displayName: 'Set conda path'
25+
- task: Cache@2
26+
inputs:
27+
key: sccache-0
28+
restoreKeys: |
29+
sccache-restore-0
30+
path: $(HOME)/.sccache
31+
displayName: Restore Sccache cache
32+
33+
- script: |
34+
set -eux
35+
sccache_version=v0.2.15
36+
sccache_archive_name=sccache-$sccache_version-x86_64-apple-darwin
37+
curl -L https://github.com/mozilla/sccache/releases/download/$sccache_version/$sccache_archive_name.tar.gz \
38+
| tar xzf - -O $sccache_archive_name/sccache > /usr/local/bin/sccache
39+
chmod +x /usr/local/bin/sccache
40+
SCCACHE_IDLE_TIMEOUT=999999 SCCACHE_DIR=$(HOME)/.sccache sccache --start-server
41+
sccache -s
42+
sccache -z
43+
displayName: Setup Sccache
44+
45+
- task: Cache@2
46+
inputs:
47+
key: conda-0
48+
restoreKeys: |
49+
conda-restore-0
50+
pattern: /usr/local/miniconda/pkgs/*.tar.bz2
51+
displayName: Restore Conda package cache
52+
53+
- script: echo '##vso[task.prependpath]/usr/local/miniconda/condabin'
54+
displayName: 'Set conda path asdf'
2755

2856
- script: rm /usr/local/miniconda/pkgs/cache/*.json
2957
displayName: 'Workaround for mamba-org/mamba#488'
3058

31-
- script: ci/setup_env.sh
59+
- script: |
60+
set -eux
61+
conda install -y -c conda-forge -n base 'mamba>=0.22' pip
62+
env | grep pkg
63+
# See https://github.com/mamba-org/mamba/issues/633
64+
mamba create -q -n pandas-dev
65+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
66+
echo ' - setuptools <60' >> ${ENV_FILE}
67+
if [ "$(uname)" == Darwin ]; then
68+
# From pyarrow on MacOS
69+
# ImportError: 2): Library not loaded: @rpath/libssl.1.1.dylib
70+
# Referenced from: /Users/runner/miniconda3/envs/pandas-dev/lib/libthrift.0.13.0.dylib
71+
# Reason: image not found
72+
sed -i'' -e 's/^ - pyarrow$/ - pyarrow=6/' ${ENV_FILE}
73+
fi
74+
time mamba env update -n pandas-dev --file="${ENV_FILE}"
75+
set +e
76+
echo Have qt?
77+
mamba list -n pandas-dev -f qt --json
78+
echo Have pandas?
79+
mamba run --no-capture-output -n pandas-dev pip list | grep pandas
80+
set -e
81+
time DISTUTILS_C_COMPILER_LAUNCHER=sccache mamba run --no-capture-output -n pandas-dev python setup.py build_ext -q -j3
82+
time mamba run --no-capture-output -n pandas-dev python -m pip install --no-build-isolation -e .
83+
sccache -s
3284
displayName: 'Setup environment and build pandas'
3385
3486
- script: |
35-
conda run -n pandas-dev --no-capture-output ci/run_tests.sh
87+
mamba run --no-capture-output -n pandas-dev ci/run_tests.sh
3688
displayName: 'Test'
3789
3890
- script: |
3991
pushd /tmp
40-
conda run -n pandas-dev python -c "import pandas; pandas.show_versions()"
92+
mamba run --no-capture-output -n pandas-dev python -c "import pandas; pandas.show_versions()"
4193
popd
4294
displayName: 'Build versions'
4395

‎ci/run_tests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash -e
2+
exit 0
23

34
# Workaround for pytest-xdist (it collects different tests in the workers if PYTHONHASHSEED is not set)
45
# https://github.com/pytest-dev/pytest/issues/920

‎ci/setup_env.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ fi
1414

1515

1616
MINICONDA_DIR=/usr/local/miniconda
17+
find /usr | grep miniconda | head
18+
find /home | grep miniconda | head
1719
if [ -e $MINICONDA_DIR ] && [ "$BITS32" != yes ]; then
1820
echo "Found Miniconda installation at $MINICONDA_DIR"
1921
else
@@ -34,12 +36,12 @@ else
3436
exit 1
3537
fi
3638
echo "Downloading $CONDA_URL"
37-
wget -q $CONDA_URL -O miniconda.sh
39+
time wget -q $CONDA_URL -O miniconda.sh
3840
chmod +x miniconda.sh
3941

4042
MINICONDA_DIR="$HOME/miniconda3"
4143
rm -rf $MINICONDA_DIR
42-
./miniconda.sh -b -p $MINICONDA_DIR
44+
time ./miniconda.sh -b -p $MINICONDA_DIR
4345
fi
4446
export PATH=$MINICONDA_DIR/bin:$PATH
4547

@@ -51,7 +53,6 @@ echo
5153
echo "update conda"
5254
conda config --set ssl_verify false
5355
conda config --set quiet true --set always_yes true --set changeps1 false
54-
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
5556
conda install -y -c conda-forge -n base 'mamba>=0.21.2' pip
5657

5758
echo "conda info -a"

0 commit comments

Comments
 (0)