Skip to content

fix pandas.show_versions() and remove pin for setuptools #47096

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 25, 2022
Merged

fix pandas.show_versions() and remove pin for setuptools #47096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8317911
fix pandas.show_versions() and remove pin for setuptools
simonjayhawkins May 23, 2022
4b65238
remove Numpy Dev xfails
simonjayhawkins May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/python-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,10 @@ jobs:
with:
python-version: '3.11-dev'

# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
- name: Install dependencies
shell: bash -el {0}
run: |
python -m pip install --upgrade pip "setuptools<60.0.0" wheel
python -m pip install --upgrade pip setuptools wheel
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
pip install git+https://github.com/nedbat/coveragepy.git
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/sdist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
- name: Install dependencies
run: |
python -m pip install --upgrade pip "setuptools<60.0.0" wheel
python -m pip install --upgrade pip setuptools wheel

# GH 39416
pip install numpy
Expand All @@ -66,10 +65,8 @@ jobs:
channels: conda-forge
python-version: '${{ matrix.python-version }}'

# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
- name: Install pandas from sdist
run: |
python -m pip install --upgrade "setuptools<60.0.0"
pip list
python -m pip install dist/*.gz

Expand Down
5 changes: 1 addition & 4 deletions ci/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ echo
echo "update conda"
conda config --set ssl_verify false
conda config --set quiet true --set always_yes true --set changeps1 false
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
conda install -y -c conda-forge -n base 'mamba>=0.21.2' pip
conda install -y -c conda-forge -n base 'mamba>=0.21.2' pip setuptools

echo "conda info -a"
conda info -a
Expand All @@ -67,8 +66,6 @@ echo "mamba env update --file=${ENV_FILE}"
# See https://github.com/mamba-org/mamba/issues/633
mamba create -q -n pandas-dev
time mamba env update -n pandas-dev --file="${ENV_FILE}"
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
mamba install -n pandas-dev 'setuptools<60'

echo "conda list -n pandas-dev"
conda list -n pandas-dev
Expand Down
9 changes: 0 additions & 9 deletions pandas/tests/util/test_show_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from pandas.compat import (
IS64,
is_ci_environment,
is_numpy_dev,
)
from pandas.util._print_versions import (
_get_dependency_info,
Expand All @@ -16,14 +15,6 @@

import pandas as pd

# This is failing on the Numpy Dev build,
# but the error may just be from distutils?
pytestmark = pytest.mark.xfail(
is_numpy_dev,
reason="_distutils not in python3.10/distutils/core.py",
raises=AssertionError,
)


@pytest.mark.filterwarnings(
# openpyxl
Expand Down
2 changes: 1 addition & 1 deletion pandas/util/_print_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def _get_dependency_info() -> dict[str, JSONSerializable]:
"pytz",
"dateutil",
# install / build,
"pip",
"setuptools",
"pip",
"Cython",
# test
"pytest",
Expand Down