Skip to content

Commit 08d5bb0

Browse files
committed
Undo Ccache and Micromamba changes
1 parent e89dcde commit 08d5bb0

File tree

4 files changed

+38
-64
lines changed

4 files changed

+38
-64
lines changed

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

+5-15
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,22 @@ runs:
55
steps:
66
- name: Environment Detail
77
run: |
8-
if which micromamba; then
9-
micromamba info
10-
micromamba list
11-
micromamba info | grep -Ei 'environment.+:' | grep -qEiv 'environment.+:.+none'
8+
if which mamba; then
9+
mamba info
10+
mamba list
11+
mamba info | grep -Ei 'environment.+:' | grep -qEiv 'environment.+:.+none'
1212
fi
1313
if which pip; then
1414
pip list
1515
fi
1616
python --version
1717
shell: bash -el {0}
1818

19-
- name: Get Python version
20-
id: get-python-version
21-
run: python3 -c "import platform as p; print(f'::set-output name=version::{p.python_implementation()}-{p.python_version()}')"
22-
shell: bash -el {0}
23-
24-
- name: Set up sccache
25-
uses: ./.github/actions/setup-sccache
26-
with:
27-
extra-cache-key: ${{ steps.get-python-version.outputs.version }}
28-
2919
- name: Build Pandas
3020
run: |
3121
which python
3222
which pip
33-
time DISTUTILS_C_COMPILER_LAUNCHER=sccache python setup.py build_ext -v -j 2
23+
time python setup.py build_ext -v -j 2
3424
pip install -v -e . --no-build-isolation --no-use-pep517 --no-index
3525
shell: bash -el {0}
3626

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

-28
This file was deleted.

.github/actions/setup/action.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,27 @@ runs:
2222
shell: bash
2323
if: ${{ inputs.pyarrow-version }}
2424

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 }}
29+
shell: bash
30+
if: ${{ inputs.python-version }}
31+
2532
- name: Pin setuptools (GH#44980)
2633
run: |
2734
echo ' - setuptools <60' >> ${{ inputs.environment-file }}
2835
shell: bash
2936

3037
- name: Install ${{ inputs.environment-file }} (Python ${{ inputs.python-version }})
31-
uses: mamba-org/provision-with-micromamba@main
38+
uses: conda-incubator/setup-miniconda@v2
3239
with:
33-
environment-name: ${{ inputs.environment-name }}
40+
activate-environment: ${{ inputs.environment-name }}
3441
environment-file: ${{ inputs.environment-file }}
35-
extra-specs: |
36-
${{ inputs.python-version && format('python={0}', inputs.python-version) }}
37-
cache-env: true
42+
channel-priority: strict
43+
channels: conda-forge
44+
mamba-version: "0.22"
45+
use-mamba: true
3846
if: ${{ inputs.is-pypy == 'false' }} # No pypy3.8 support
3947

4048
- name: Setup PyPy

.github/workflows/sdist.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,35 @@ jobs:
6060
name: ${{ matrix.python-version }}-sdist.gz
6161
path: dist/*.gz
6262

63-
- name: Set up Conda env with Python ${{ matrix.python-version }}, NumPy ${{ matrix.numpy-version }}
64-
# TODO: Change this when https://github.com/mamba-org/provision-with-micromamba/pull/45 is merged
65-
uses: jonashaag/provision-with-micromamba@cache-failure
66-
with:
67-
environment-file: false
68-
environment-name: pandas-sdist
69-
channels: conda-forge
70-
extra-specs: |
71-
python=${{ matrix.python-version }}
72-
setuptools<60
73-
numpy=${{ matrix.numpy-version }}
74-
cache-env: true
63+
- name: Create environment.yml with Python ${{ matrix.python-version }}, NumPy ${{ matrix.numpy-version }}
64+
run: |
65+
cat >> tmp_environment.yml <<EOF
66+
name: pandas-sdist
67+
channels:
68+
- conda-forge
69+
dependencies:
70+
- python=${{ matrix.python-version }}
71+
- setuptools<60
72+
- numpy=${{ matrix.numpy-version }}
73+
EOF
7574
76-
- name: Set up sccache
77-
uses: ./.github/actions/setup-sccache
75+
- name: Install Conda enviroment
76+
uses: conda-incubator/setup-miniconda@v2
7877
with:
79-
extra-cache-key: ${{ matrix.python-version }}
78+
activate-environment: pandas-sdist
79+
environment-file: tmp_environment.yml
80+
channel-priority: strict
81+
channels: conda-forge
82+
mamba-version: "0.22"
83+
use-mamba: true
8084

8185
- name: Install pandas from sdist
8286
run: |
8387
micromamba info
8488
# Double check that we have the expected NumPy
8589
pip list
8690
pip list | egrep -i "numpy.+${{ matrix.numpy-version }}"
87-
time DISTUTILS_C_COMPILER_LAUNCHER=sccache python -m pip install -v dist/*.gz
91+
time python -m pip install -v dist/*.gz
8892
8993
- name: Build Version
9094
run: |

0 commit comments

Comments
 (0)