Skip to content
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.

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

Require Python 3.6+; drop Python 3.5 from CI #5715

Merged
merged 1 commit into from
May 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ def TestPythonCPU() {
def docker_binary = "docker"
sh """
${dockerRun} ${container_type} ${docker_binary} tests/ci_build/test_python.sh cpu
${dockerRun} ${container_type} ${docker_binary} tests/ci_build/test_python.sh cpu-py35
"""
deleteDir()
}
Expand Down
3 changes: 1 addition & 2 deletions python-package/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,10 @@ def run(self):
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8'],
python_requires='>=3.5',
python_requires='>=3.6',
url='https://github.com/dmlc/xgboost')

clean_up()
6 changes: 0 additions & 6 deletions python-package/xgboost/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
except ImportError:
pass

if sys.version_info[:2] == (3, 5):
warnings.warn(
'Python 3.5 support is deprecated; XGBoost will require Python 3.6+ in the near future. ' +
'Consider upgrading to Python 3.6+.',
FutureWarning)

VERSION_FILE = os.path.join(os.path.dirname(__file__), 'VERSION')
with open(VERSION_FILE) as f:
__version__ = f.read().strip()
Expand Down
6 changes: 0 additions & 6 deletions tests/ci_build/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ ENV PATH=/opt/python/bin:$PATH

ENV GOSU_VERSION 1.10

# Create new Conda environment with Python 3.5
RUN conda create -n py35 python=3.5 && \
source activate py35 && \
pip install numpy pytest scipy scikit-learn pandas matplotlib wheel kubernetes urllib3 graphviz && \
source deactivate

# Install Python packages in default env
RUN \
pip install pyyaml cpplint pylint astroid sphinx numpy scipy pandas matplotlib sh \
Expand Down
8 changes: 1 addition & 7 deletions tests/ci_build/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,8 @@ case "$suite" in
./runtests.sh
;;

cpu-py35)
source activate py35
install_xgboost
pytest -v -s --fulltrace tests/python
;;

*)
echo "Usage: $0 {gpu|mgpu|cudf|cpu|cpu-py35}"
echo "Usage: $0 {gpu|mgpu|cudf|cpu}"
exit 1
;;
esac