Skip to content

Commit

Permalink
adding 3.12 in to matrix (backport #1523) (#1533)
Browse files Browse the repository at this point in the history
* adding python 3.12 in to matrix (#1523)

* Updating numpy dep for 3.12

* fixing dpctl deps

* Restricting catboost python versions

(cherry picked from commit 5571941)

# Conflicts:
#	requirements-test-optional.txt

* Update catboost version in requirements-test-optional.txt

---------

Co-authored-by: Nikolay Petrov <nikolay.a.petrov@intel.com>
Co-authored-by: Alexander Andreev <alexander.andreev@intel.com>
  • Loading branch information
3 people authored Oct 16, 2023
1 parent 5165cc0 commit e7b669f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .ci/pipeline/build-and-test-lnx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ steps:
displayName: 'System info'
- script: |
conda update -y -q conda
if [ $(echo $(PYTHON_VERSION) | grep '3.7') ] || [ $(echo $(PYTHON_VERSION) | grep '3.11') ]; then export DPCPP_PACKAGE="dpcpp-cpp-rt>=2023.2.0"; else export DPCPP_PACKAGE="dpctl>=0.14 dpcpp-cpp-rt>=2023.2.0"; fi
conda create -q -y -n CB -c conda-forge -c intel python=$(PYTHON_VERSION) dal-devel mpich pyyaml $DPCPP_PACKAGE
if [ $(echo $(PYTHON_VERSION) | grep '3.8\|3.9\|3.10') ]; then export DPCPP_PACKAGE="dpctl>=0.14 "; else export DPCPP_PACKAGE=""; fi
conda create -q -y -n CB -c conda-forge -c intel python=$(PYTHON_VERSION) dal-devel mpich pyyaml $DPCPP_PACKAGE dpcpp-cpp-rt>=2023.2.0
displayName: 'Conda create'
- script: |
. /usr/share/miniconda/etc/profile.d/conda.sh
Expand Down
6 changes: 6 additions & 0 deletions .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ jobs:
Python3.11_Sklearn1.3:
PYTHON_VERSION: '3.11'
SKLEARN_VERSION: '1.3'
Python3.12_Sklearn1.3:
PYTHON_VERSION: '3.12'
SKLEARN_VERSION: '1.3'
pool:
vmImage: 'ubuntu-22.04'
steps:
Expand Down Expand Up @@ -106,6 +109,9 @@ jobs:
Python3.11_Sklearn1.3:
PYTHON_VERSION: '3.11'
SKLEARN_VERSION: '1.3'
Python3.12_Sklearn1.3:
PYTHON_VERSION: '3.12'
SKLEARN_VERSION: '1.3'
pool:
vmImage: 'windows-latest'
steps:
Expand Down
3 changes: 2 additions & 1 deletion dependencies-dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Cython==3.0.2
Jinja2==3.1.2
numpy==1.19.5 ; python_version <= '3.9'
numpy==1.21.6 ; python_version == '3.10'
numpy==1.23.5 ; python_version >= '3.11'
numpy==1.23.5 ; python_version == '3.11'
numpy==1.26.0 ; python_version >= '3.12'
pybind11==2.10.1
cmake==3.27.4.1
2 changes: 1 addition & 1 deletion requirements-test-optional.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
xgboost==1.7.6; python_version <= '3.9'
xgboost==2.0.0; python_version >= '3.10'
lightgbm==4.1.0
catboost==1.2.1
catboost==1.2.2; python_version <= '3.11'

0 comments on commit e7b669f

Please sign in to comment.