8000 MAINT do not copy anymore conftest.py (#27958) · punndcoder28/scikit-learn@8f5ff39 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f5ff39

Browse files
glemaitreglemaitre
authored
MAINT do not copy anymore conftest.py (scikit-learn#27958)
1 parent 4d353c6 commit 8f5ff39

File tree

6 files changed

+0
-18
lines changed

6 files changed

+0
-18
lines changed

‎.github/workflows/wheels.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ jobs:
129129

130130
- name: Build and test wheels
131131
env:
132-
CONFTEST_PATH: ${{ github.workspace }}/conftest.py
133-
CONFTEST_NAME: conftest.py
134132
CIBW_PRERELEASE_PYTHONS: ${{ matrix.prerelease }}
135133
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
136134
SKLEARN_BUILD_PARALLEL=3

‎build_tools/cirrus/arm_wheel.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ macos_arm64_wheel_task:
22
macos_instance:
33
image: ghcr.io/cirruslabs/macos-monterey-xcode
44
env:
5-
CONFTEST_PATH: ${CIRRUS_WORKING_DIR}/conftest.py
6-
CONFTEST_NAME: conftest.py
75
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
86
SKLEARN_BUILD_PARALLEL=5
97
CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh
@@ -49,8 +47,6 @@ linux_arm64_wheel_task:
4947
cpu: 4
5048
memory: 4G
5149
env:
52-
CONFTEST_PATH: ${CIRRUS_WORKING_DIR}/conftest.py
53-
CONFTEST_NAME: conftest.py
5450
CIBW_ENVIRONMENT: SKLEARN_SKIP_NETWORK_TESTS=1
5551
SKLEARN_BUILD_PARALLEL=5
5652
CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh

‎build_tools/github/Windows

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ ARG PYTHON_VERSION
33
FROM winamd64/python:$PYTHON_VERSION-windowsservercore
44

55
ARG WHEEL_NAME
6-
ARG CONFTEST_NAME
76
ARG CIBW_TEST_REQUIRES
87

98
# Copy and install the Windows wheel
109
COPY $WHEEL_NAME $WHEEL_NAME
11-
COPY $CONFTEST_NAME $CONFTEST_NAME
1210
RUN pip install $env:WHEEL_NAME
1311

1412
# Install the testing dependencies

‎build_tools/github/build_minimal_windows_image.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ fi
2020
# Build a minimal Windows Docker image for testing the wheels
2121
docker build --build-arg PYTHON_VERSION=$PYTHON_VERSION \
2222
--build-arg WHEEL_NAME=$WHEEL_NAME \
23-
--build-arg CONFTEST_NAME=$CONFTEST_NAME \
2423
--build-arg CIBW_TEST_REQUIRES="$CIBW_TEST_REQUIRES" \
2524
-f build_tools/github/Windows \
2625
-t scikit-learn/minimal-windows .

‎build_tools/github/test_source.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ python -m pip install pytest pandas
1313

1414
# Run the tests on the installed source distribution
1515
mkdir tmp_for_test
16-
cp scikit-learn/scikit-learn/conftest.py tmp_for_test
1716
cd tmp_for_test
1817

1918
pytest --pyargs sklearn

‎build_tools/wheels/test_wheels.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
set -e
44
set -x
55

6-
UNAME=$(uname)
7-
8-
if [[ "$UNAME" != "Linux" ]]; then
9-
# The Linux test environment is run in a Docker container and
10-
# it is not possible to copy the test configuration file (yet)
11-
cp $CONFTEST_PATH $CONFTEST_NAME
12-
fi
13-
146
python -c "import joblib; print(f'Number of cores (physical): \
157
{joblib.cpu_count()} ({joblib.cpu_count(only_physical_cores=True)})')"
168

0 commit comments

Comments
 (0)
0