Skip to content

Commit a7eea52

Browse files
committed
Update default python build to 3.9 and add 3.11, fix build failures
1 parent f683d18 commit a7eea52

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.github/workflows/CI-python-minimal.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
packageDirectory: ["ml_wrappers"]
1616
operatingSystem: [ubuntu-latest, macos-latest, windows-latest]
17-
pythonVersion: ['3.8', '3.9', '3.10', '3.11']
17+
pythonVersion: ['3.9', '3.10', '3.11']
1818

1919
runs-on: ${{ matrix.operatingSystem }}
2020

@@ -48,7 +48,7 @@ jobs:
4848
path: htmlcov
4949
# Use always() to always run this step to publish test results when there are test failures
5050
if: ${{ always() }}
51-
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.8') }}
51+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
5252
name: Upload to codecov
5353
id: codecovupload1
5454
uses: codecov/codecov-action@v3
@@ -61,7 +61,7 @@ jobs:
6161
flags: unittests
6262
name: codecov-umbrella
6363
verbose: true
64-
- if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }}
64+
- if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }}
6565
name: Retry upload to codecov
6666
id: codecovupload2
6767
uses: codecov/codecov-action@v3
@@ -75,7 +75,7 @@ jobs:
7575
name: codecov-umbrella
7676
verbose: true
7777
- name: Set codecov status
78-
if: ${{ (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }}
78+
if: ${{ (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }}
7979
shell: bash
8080
run: |
8181
if ${{ (steps.codecovupload1.outcome == 'success') || (steps.codecovupload2.outcome == 'success') }} ; then

.github/workflows/CI-python.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
packageDirectory: ["ml_wrappers"]
1616
operatingSystem: [ubuntu-latest, macos-latest, windows-latest]
17-
pythonVersion: ['3.9', '3.10']
17+
pythonVersion: ['3.9', '3.10', '3.11']
1818
openaiVersion: ['0.28.1', 'openai-latest']
1919
exclude:
2020
- openaiVersion: '0.28.1'
@@ -42,22 +42,22 @@ jobs:
4242
brew install libomp
4343
4444
- if: ${{ matrix.operatingSystem == 'windows-latest' }}
45-
name: Install pytorch on windows for python 3.8 to 3.10
45+
name: Install pytorch on windows for python 3.9 to 3.11
4646
shell: bash -l {0}
4747
run: |
48-
conda install --yes --quiet "pytorch<2.0.0" torchvision captum cpuonly "libtiff<4.5.0" -c pytorch -c conda-forge --strict-channel-priority
48+
conda install --yes --quiet pytorch torchvision captum cpuonly "libtiff<4.5.0" -c pytorch -c conda-forge --strict-channel-priority
4949
5050
- if: ${{ matrix.operatingSystem == 'ubuntu-latest' }}
51-
name: Install pytorch on ubuntu for python 3.8 to 3.10
51+
name: Install pytorch on ubuntu for python 3.9 to 3.11
5252
shell: bash -l {0}
5353
run: |
54-
conda install --yes --quiet "pytorch<2.0.0" torchvision captum cpuonly -c pytorch -c conda-forge --strict-channel-priority
54+
conda install --yes --quiet pytorch torchvision captum cpuonly -c pytorch -c conda-forge --strict-channel-priority
5555
5656
- if: ${{ matrix.operatingSystem == 'macos-latest' }}
57-
name: Install pytorch on MacOS for python 3.8 to 3.10
57+
name: Install pytorch on MacOS for python 3.9 to 3.11
5858
shell: bash -l {0}
5959
run: |
60-
conda install --yes --quiet "pytorch<2.0.0" torchvision captum -c pytorch -c conda-forge --strict-channel-priority
60+
conda install --yes --quiet pytorch torchvision captum -c pytorch -c conda-forge --strict-channel-priority
6161
6262
- if: ${{ matrix.operatingSystem == 'macos-latest' }}
6363
name: Install lightgbm from conda on MacOS
@@ -104,7 +104,7 @@ jobs:
104104
# Use always() to always run this step to publish test results when there are test failures
105105
if: ${{ always() }}
106106

107-
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.8') }}
107+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
108108
name: Upload to codecov
109109
id: codecovupload1
110110
uses: codecov/codecov-action@v3
@@ -118,7 +118,7 @@ jobs:
118118
name: codecov-umbrella
119119
verbose: true
120120

121-
- if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }}
121+
- if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }}
122122
name: Retry upload to codecov
123123
id: codecovupload2
124124
uses: codecov/codecov-action@v3
@@ -133,7 +133,7 @@ jobs:
133133
verbose: true
134134

135135
- name: Set codecov status
136-
if: ${{ (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }}
136+
if: ${{ (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }}
137137
shell: bash
138138
run: |
139139
if ${{ (steps.codecovupload1.outcome == 'success') || (steps.codecovupload2.outcome == 'success') }} ; then

.github/workflows/release-ml-wrappers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Install pytorch on non-MacOS
3232
shell: bash -l {0}
3333
run: |
34-
conda install --yes --quiet "pytorch<2.0.0" torchvision captum cpuonly -c pytorch -c conda-forge --strict-channel-priority
34+
conda install --yes --quiet pytorch torchvision captum cpuonly -c pytorch -c conda-forge --strict-channel-priority
3535
3636
- if: ${{ matrix.operatingSystem == 'macos-latest' }}
3737
name: Install Anaconda packages on MacOS, which should not include cpuonly according to official docs

python/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Machine Learning Wrappers SDK for Python
22

3-
### This package has been tested with Python 3.8, 3.9 and 3.10
3+
### This package has been tested with Python 3.9, 3.10 and 3.11
44

55
The Machine Learning Wrappers SDK provides a unified wrapper for various ML frameworks - to have one uniform scikit-learn format predict and predict_proba functions.
66

python/docs/dependencies.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ requirements-dev.txt
4242

4343
- lightgbm
4444
- xgboost
45-
- catboost<1.2
45+
- catboost
4646
- tensorflow
4747
- shap
4848
- transformers<4.40.0

python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
'Intended Audience :: Science/Research',
2727
'License :: OSI Approved :: MIT License',
2828
'Programming Language :: Python :: 3',
29-
'Programming Language :: Python :: 3.8',
3029
'Programming Language :: Python :: 3.9',
3130
'Programming Language :: Python :: 3.10',
31+
'Programming Language :: Python :: 3.11',
3232
'Topic :: Scientific/Engineering :: Artificial Intelligence',
3333
'Operating System :: Microsoft :: Windows',
3434
'Operating System :: MacOS',

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lightgbm
22
xgboost
3-
catboost<1.2
3+
catboost
44
tensorflow
55
shap
66
transformers<4.40.0

0 commit comments

Comments
 (0)