Skip to content

Commit 21573df

Browse files
jonashaagjonashaag
committed
wip
1 parent f5d7550 commit 21573df

File tree

7 files changed

+44
-154
lines changed

7 files changed

+44
-154
lines changed

‎.github/actions/build-pandas/action.yml

-27
This file was deleted.

‎.github/actions/run-tests/action.yml

-34
This file was deleted.

‎.github/actions/setup/action.yml

+4-50
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,12 @@
11
name: Set up pandas
22
description: Runs all the setup steps required to have a built pandas ready to use
3-
inputs:
4-
environment-file:
5-
default: environment.yml
6-
pyarrow-version:
7-
required: false
8-
is-pypy:
9-
default: false
10-
environment-name:
11-
default: pandas-dev
12-
python-version:
13-
required: false
143
runs:
154
using: composite
165
steps:
17-
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
18-
run: |
19-
grep -q ' - pyarrow' ${{ inputs.environment-file }}
20-
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21-
cat ${{ inputs.environment-file }}
6+
- name: Setting conda path
7+
run: echo "${HOME}/miniconda3/bin" >> $GITHUB_PATH
228
shell: bash -el {0}
23-
if: ${{ inputs.pyarrow-version }}
249

25-
- name: Set Python version in ${{ inputs.environment-file }} to ${{ inputs.python-version }}
26-
run: |
27-
echo " - python=${{ inputs.pyarrow-version }}" >> ${{ inputs.environment-file }}
28-
cat ${{ inputs.environment-file }}
10+
- name: Setup environment and build pandas
11+
run: ci/setup_env.sh
2912
shell: bash -el {0}
30-
if: ${{ inputs.python-version }}
31-
32-
- name: Pin setuptools (GH#44980)
33-
run: |
34-
echo ' - setuptools <60' >> ${{ inputs.environment-file }}
35-
shell: bash -el {0}
36-
37-
- name: Install ${{ inputs.environment-file }} (Python ${{ inputs.python-version }})
38-
uses: conda-incubator/[email protected]
39-
with:
40-
activate-environment: ${{ inputs.environment-name }}
41-
environment-file: ${{ inputs.environment-file }}
42-
channel-priority: strict
43-
channels: conda-forge
44-
mamba-version: "0.22"
45-
use-mamba: true
46-
if: ${{ inputs.is-pypy == 'false' }} # No pypy3.8 support
47-
48-
- name: Setup PyPy
49-
uses: actions/setup-python@v3
50-
with:
51-
python-version: "pypy-3.8"
52-
if: ${{ inputs.is-pypy == 'true' }}
53-
54-
- name: Setup PyPy dependencies
55-
# TODO: re-enable cov, its slowing the tests down though
56-
run: pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 hypothesis>=5.5.3 pytest-asyncio>=0.17
57-
shell: bash -el {0}
58-
if: ${{ inputs.is-pypy == 'true' }}

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
web_and_docs:
1919
name: Doc Build and Upload
2020
runs-on: ubuntu-latest
21-
defaults:
22-
run:
23-
shell: bash -el {0}
2421

2522
concurrency:
2623
# https://github.community/t/concurrecy-not-work-for-push/183068/7
@@ -34,12 +31,16 @@ jobs:
3431
fetch-depth: 0
3532

3633
- name: Set up pandas
37-
run: ci/setup_env.sh
34+
uses: ./.github/actions/setup
3835

3936
- name: Build website
40-
run: python web/pandas_web.py web/pandas --target-path=web/build
37+
run: |
38+
source activate pandas-dev
39+
python web/pandas_web.py web/pandas --target-path=web/build
4140
- name: Build documentation
42-
run: doc/make.py --warnings-are-errors
41+
run: |
42+
source activate pandas-dev
43+
doc/make.py --warnings-are-errors
4344
4445
- name: Install ssh key
4546
run: |

‎.github/workflows/posix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140

141141
- uses: conda-incubator/[email protected]
142142
with:
143-
mamba-version: "0.22"
143+
mamba-version: "*"
144144
channels: conda-forge
145145
activate-environment: pandas-dev
146146
channel-priority: flexible

‎azure-pipelines.yml

+32-32
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ variables:
2121
PATTERN: "not slow and not db and not network and not single_cpu"
2222
PANDAS_CI: 1
2323

24-
# jobs:
25-
# - template: ci/azure/posix.yml
26-
# parameters:
27-
# name: macOS
28-
# vmImage: macOS-10.15
24+
jobs:
25+
- template: ci/azure/posix.yml
26+
parameters:
27+
name: macOS
28+
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 pytest-asyncio hypothesis && \
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 and not single_cpu' 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 pytest-asyncio>=0.17 hypothesis && \
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 and not single_cpu' 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/run_tests.sh

-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ if [[ "$PATTERN" ]]; then
3030
PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\""
3131
fi
3232

33-
which pytest
34-
which python
35-
pytest -VV || true
36-
python -VV || true
3733
echo $PYTEST_CMD
3834
sh -c "$PYTEST_CMD"
3935

0 commit comments

Comments
 (0)