Update Python requirement to >=3.8. (#8071)

Additional changes:
- Use mamba for CPU test on Jenkins.
- Cleanup CPU test dependencies.
- Restore some of the modin tests
This commit is contained in:
Jiaming Yuan 2022-07-14 18:01:47 +08:00 committed by GitHub
parent 8dd96013f1
commit dae7a41baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 31 deletions

View File

@ -136,7 +136,7 @@ jobs:
submodules: 'true' submodules: 'true'
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.7' python-version: "3.8"
architecture: 'x64' architecture: 'x64'
- name: Install Python packages - name: Install Python packages
run: | run: |
@ -155,7 +155,7 @@ jobs:
submodules: 'true' submodules: 'true'
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.7' python-version: "3.8"
architecture: 'x64' architecture: 'x64'
- name: Install Python packages - name: Install Python packages
run: | run: |
@ -173,7 +173,7 @@ jobs:
submodules: 'true' submodules: 'true'
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.7' python-version: "3.8"
architecture: 'x64' architecture: 'x64'
- name: Install system packages - name: Install system packages
run: | run: |
@ -210,7 +210,7 @@ jobs:
submodules: 'true' submodules: 'true'
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.8' python-version: "3.8"
architecture: 'x64' architecture: 'x64'
- name: Install system packages - name: Install system packages
run: | run: |

View File

@ -20,7 +20,7 @@ jobs:
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: '3.9' python-version: "3.8"
- name: Build wheels - name: Build wheels
run: bash tests/ci_build/build_python_wheels.sh ${{ matrix.platform_id }} ${{ github.sha }} run: bash tests/ci_build/build_python_wheels.sh ${{ matrix.platform_id }} ${{ github.sha }}
- name: Extract branch name - name: Extract branch name

View File

@ -97,7 +97,7 @@ jobs:
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.7' python-version: "3.8"
architecture: 'x64' architecture: 'x64'
- name: Test R - name: Test R

View File

@ -365,11 +365,10 @@ if __name__ == '__main__':
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10'], 'Programming Language :: Python :: 3.10'],
python_requires=">=3.7", python_requires=">=3.8",
url='https://github.com/dmlc/xgboost') url='https://github.com/dmlc/xgboost')
clean_up() clean_up()

View File

@ -15,8 +15,8 @@ RUN \
wget -nv -nc https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh --no-check-certificate && \ wget -nv -nc https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh --no-check-certificate && \
bash cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr && \ bash cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr && \
# Python # Python
wget -O Miniconda3.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh && \
bash Miniconda3.sh -b -p /opt/python bash Mambaforge-Linux-x86_64.sh -b -p /opt/python
ENV PATH=/opt/python/bin:$PATH ENV PATH=/opt/python/bin:$PATH
ENV CC=gcc-8 ENV CC=gcc-8
@ -28,7 +28,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
# Create new Conda environment # Create new Conda environment
COPY conda_env/cpu_test.yml /scripts/ COPY conda_env/cpu_test.yml /scripts/
RUN conda env create -n cpu_test --file=/scripts/cpu_test.yml RUN mamba env create -n cpu_test --file=/scripts/cpu_test.yml
# Install lightweight sudo (not bound to TTY) # Install lightweight sudo (not bound to TTY)
RUN set -ex; \ RUN set -ex; \

View File

@ -34,7 +34,7 @@ if [[ "$platform_id" == macosx_* ]]; then
elif [[ "$platform_id" == macosx_x86_64 ]]; then elif [[ "$platform_id" == macosx_x86_64 ]]; then
# MacOS, Intel # MacOS, Intel
wheel_tag=macosx_10_15_x86_64.macosx_11_0_x86_64.macosx_12_0_x86_64 wheel_tag=macosx_10_15_x86_64.macosx_11_0_x86_64.macosx_12_0_x86_64
cpython_ver=37 cpython_ver=38
export MACOSX_DEPLOYMENT_TARGET=10.13 export MACOSX_DEPLOYMENT_TARGET=10.13
#OPENMP_URL="https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-64/llvm-openmp-11.1.0-hda6cdc1_1.tar.bz2" #OPENMP_URL="https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-64/llvm-openmp-11.1.0-hda6cdc1_1.tar.bz2"
OPENMP_URL="https://xgboost-ci-jenkins-artifacts.s3.us-west-2.amazonaws.com/llvm-openmp-11.1.0-hda6cdc1_1-osx-64.tar.bz2" OPENMP_URL="https://xgboost-ci-jenkins-artifacts.s3.us-west-2.amazonaws.com/llvm-openmp-11.1.0-hda6cdc1_1-osx-64.tar.bz2"

View File

@ -2,7 +2,7 @@ name: aarch64_test
channels: channels:
- conda-forge - conda-forge
dependencies: dependencies:
- python=3.7 - python=3.8
- pip - pip
- wheel - wheel
- pytest - pytest

View File

@ -1,8 +1,9 @@
name: cpu_test name: cpu_test
channels: channels:
- defaults
- conda-forge - conda-forge
dependencies: dependencies:
- python=3.7 - python=3.8
- pip - pip
- wheel - wheel
- pyyaml - pyyaml
@ -13,16 +14,13 @@ dependencies:
- scikit-learn - scikit-learn
- pandas - pandas
- matplotlib - matplotlib
- dask - dask>=2022.6
- distributed - distributed>=2022.6
- python-graphviz - python-graphviz
- hypothesis - hypothesis>=6.46
- astroid - astroid
- sphinx
- sh - sh
- recommonmark
- mock - mock
- breathe
- pytest - pytest
- pytest-cov - pytest-cov
- python-kubernetes - python-kubernetes
@ -30,17 +28,13 @@ dependencies:
- jsonschema - jsonschema
- boto3 - boto3
- awscli - awscli
- numba
- llvmlite
- py-ubjson - py-ubjson
- cffi - cffi
- pyarrow - pyarrow
- protobuf<=3.20 - protobuf
- pyspark - pyspark>=3.3.0
- cloudpickle - cloudpickle
- shap
- modin
- pip: - pip:
- shap
- ipython # required by shap at import time.
- sphinx_rtd_theme
- datatable - datatable
- modin[all]

View File

@ -2,7 +2,7 @@ name: macos_test
channels: channels:
- conda-forge - conda-forge
dependencies: dependencies:
- python=3.7 - python=3.8
- pip - pip
- wheel - wheel
- pyyaml - pyyaml

View File

@ -19,9 +19,8 @@ rng = np.random.RandomState(1994)
class TestModin: class TestModin:
@pytest.mark.xfail
def test_modin(self): def test_modin(self):
df = md.DataFrame([[1, 2., True], [2, 3., False]], df = md.DataFrame([[1, 2., True], [2, 3., False]],
columns=['a', 'b', 'c']) columns=['a', 'b', 'c'])
dm = xgb.DMatrix(df, label=md.Series([1, 2])) dm = xgb.DMatrix(df, label=md.Series([1, 2]))