Skip to content

Commit

Permalink
Revert "rm python 3.6; add python 3.12"
Browse files Browse the repository at this point in the history
This reverts commit aa55b0d.
  • Loading branch information
dev-rinchin committed Aug 6, 2024
1 parent a82b85e commit 6ba4ace
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Examples can be added in several ways:

### Installation

If you are installing from the source, you will need Python 3.8 or later.
If you are installing from the source, you will need Python 3.6.12 or later.
We recommend you install an [Anaconda](https://www.anaconda.com/products/individual#download-section)
to work with environments.

Expand Down Expand Up @@ -154,7 +154,7 @@ To run specific test:
tox -e py37 -- -x tests/unit/test_utils
```

To run tests for specific Python versions (for example python 3.8):
To run tests for specific Python versions (for example python 3.6):
```bash
poetry run tox -e py36
```
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-14-large]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-20.04, windows-latest, macos-14-large] # FIX: 'ubuntu-latest'(ubunut-22.04) -> 'ubuntu-20.04': Python version 3.6 was not found in the local cache
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand All @@ -67,7 +67,7 @@ jobs:
run: sudo apt-get install build-essential libcairo2 libpango-1.0-0 libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libffi-dev shared-mime-info

- name: install deps for Windows
if: ${{ matrix.os == 'windows-latest' }}
if: ${{ matrix.os == 'windows-latest' }} && ${{ matrix.python-version == '3.6'}}
run: pip3 install pycairo==1.20.0

- name: install tox
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/poetry_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-latest, macos-latest]
python-version: [3.8, 3.9, 3.10, 3.11, 3.12]
python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ repos:
hooks:
- id: set-py-versions
name: set python versions
description: set python versions := [3.8, 3.13) to `pyproject.toml`
description: set python versions := [3.6.1, 3.12) to `pyproject.toml`
language: python
entry: python scripts/poetry_fix.py -f
pass_filenames: false
Expand Down
28 changes: 21 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ license = "Apache-2.0"
homepage = "https://lightautoml.readthedocs.io/en/latest/"
repository = "https://github.com/AILab-MLTools/LightAutoML"
classifiers = [
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Operating System :: OS Independent",
"Intended Audience :: Science/Research",
"Development Status :: 5 - Production/Stable",
Expand All @@ -31,9 +32,11 @@ classifiers = [


[tool.poetry.dependencies]
python = ">=3.8, <3.13"
python = ">=3.6.1, <3.12"

poetry-core = "^1.0.0"
poetry-core = [
{version = ">=1.0.0", python = "<3.7"},
{version = "^1.0.0", python = "^3.7"}
]
pandas = "<2.0.0"
numpy = [
Expand All @@ -47,16 +50,24 @@ scikit-learn = [
]
lightgbm = ">=2.3, <=3.2.1"
catboost = ">=0.26.1"
xgboost = "^2.0.0"
xgboost = [
{version = "*", python = "<3.8"},
{version = "^2.0.0", python = ">=3.8"}
]
optuna = "*"
torch = ">=1.9.0, <=2.0.0"
torch = [
{platform = "win32", python = "3.6.1", version = "1.7.0"},
{version = ">=1.9.0, <=2.0.0"}
]
dataclasses = {version = "0.6", python = "<3.7"}
holidays = "*"
statsmodels = "<=0.14.0"
networkx = "*"
cmaes = "*"
pyyaml = "*"
tqdm = "*"
joblib = "<1.3.0"
importlib-metadata = {version = ">=1.0", python = "<3.8"}
autowoe = ">=1.2"
jinja2 = "*"
json2html = "*"
Expand All @@ -74,10 +85,13 @@ albumentations = {version = "<=1.0.3", optional = true}
timm = {version = ">=0.9.0", optional = true}
opencv-python = {version = "<=4.8.0.74", optional = true}
PyWavelets = {version = "*", optional = true}
torchvision = {platform = "*", version = "<=0.14.0", optional = true}
torchvision = [
{platform = "win32", python = "3.6.1", version = "0.8.0", optional = true},
{platform = "*", version = "<=0.14.0", optional = true}
]

# AFG
featuretools = {version = ">=1.11.1", optional = true}
featuretools = {version = ">=1.11.1", python = ">=3.8", optional = true}

# Report (pdf)
weasyprint = {version = "52.5", optional = true}
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
min_version = 3.28.0
isolated_build = True
envlist =
py{38, 39, 310, 311, 312},
py{36, 37, 38, 39, 310, 311},
lint,
docs,
typing,
Expand All @@ -16,11 +16,12 @@ basepython = python3

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[gh-actions:env]
PLATFORM =
Expand Down

0 comments on commit 6ba4ace

Please sign in to comment.