Thanks to visit codestin.com
Credit goes to github.com

Skip to content

MAINT do not copy anymore conftest.py #27958

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
Dec 14, 2023
Merged

MAINT do not copy anymore conftest.py #27958

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
6c8d25d
[cd build] MAINT do not copy anymore conftest.py
glemaitre Dec 14, 2023
dfbf4d9
[cd build] avoid to copy another conftest.py
glemaitre Dec 14, 2023
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
2 changes: 0 additions & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ jobs:

- name: Build and test wheels
env:
CONFTEST_PATH: ${{ github.workspace }}/conftest.py
CONFTEST_NAME: conftest.py
CIBW_PRERELEASE_PYTHONS: ${{ matrix.prerelease }}
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
SKLEARN_BUILD_PARALLEL=3
Expand Down
4 changes: 0 additions & 4 deletions build_tools/cirrus/arm_wheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ macos_arm64_wheel_task:
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-xcode
env:
CONFTEST_PATH: ${CIRRUS_WORKING_DIR}/conftest.py
CONFTEST_NAME: conftest.py
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
SKLEARN_BUILD_PARALLEL=5
CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh
Expand Down Expand Up @@ -49,8 +47,6 @@ linux_arm64_wheel_task:
cpu: 4
memory: 4G
env:
CONFTEST_PATH: ${CIRRUS_WORKING_DIR}/conftest.py
CONFTEST_NAME: conftest.py
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
SKLEARN_BUILD_PARALLEL=5
CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh
Expand Down
2 changes: 0 additions & 2 deletions build_tools/github/Windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ ARG PYTHON_VERSION
FROM winamd64/python:$PYTHON_VERSION-windowsservercore

ARG WHEEL_NAME
ARG CONFTEST_NAME
ARG CIBW_TEST_REQUIRES

# Copy and install the Windows wheel
COPY $WHEEL_NAME $WHEEL_NAME
COPY $CONFTEST_NAME $CONFTEST_NAME
RUN pip install $env:WHEEL_NAME

# Install the testing dependencies
Expand Down
1 change: 0 additions & 1 deletion build_tools/github/build_minimal_windows_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ fi
# Build a minimal Windows Docker image for testing the wheels
docker build --build-arg PYTHON_VERSION=$PYTHON_VERSION \
--build-arg WHEEL_NAME=$WHEEL_NAME \
--build-arg CONFTEST_NAME=$CONFTEST_NAME \
--build-arg CIBW_TEST_REQUIRES="$CIBW_TEST_REQUIRES" \
-f build_tools/github/Windows \
-t scikit-learn/minimal-windows .
1 change: 0 additions & 1 deletion build_tools/github/test_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ python -m pip install pytest pandas

# Run the tests on the installed source distribution
mkdir tmp_for_test
cp scikit-learn/scikit-learn/conftest.py tmp_for_test
cd tmp_for_test

pytest --pyargs sklearn
8 changes: 0 additions & 8 deletions build_tools/wheels/test_wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
set -e
set -x

UNAME=$(uname)

if [[ "$UNAME" != "Linux" ]]; then
# The Linux test environment is run in a Docker container and
# it is not possible to copy the test configuration file (yet)
cp $CONFTEST_PATH $CONFTEST_NAME
fi

python -c "import joblib; print(f'Number of cores (physical): \
{joblib.cpu_count()} ({joblib.cpu_count(only_physical_cores=True)})')"

Expand Down