From e99f90655d0efcf22559a46e928f0f98c9807ebf Mon Sep 17 00:00:00 2001 From: Sergey Kolesnikov Date: Fri, 29 Apr 2022 07:19:24 +0300 Subject: [PATCH] version update (#1414) * version update * + * + * + * + * + * + * + * + --- .github/workflows/dl_cpu.yml | 24 +----------------------- .github/workflows/dl_cpu_minimal.yml | 27 +++++++-------------------- .github/workflows/integrations.yml | 16 +++++----------- bin/workflows/check_settings.sh | 7 +++++-- catalyst/__version__.py | 2 +- requirements/requirements-cv.txt | 2 +- requirements/requirements-dev.txt | 2 +- requirements/requirements-optuna.txt | 2 +- setup.py | 2 ++ 9 files changed, 24 insertions(+), 60 deletions(-) diff --git a/.github/workflows/dl_cpu.yml b/.github/workflows/dl_cpu.yml index d28009850d..742bd3dda7 100644 --- a/.github/workflows/dl_cpu.yml +++ b/.github/workflows/dl_cpu.yml @@ -20,30 +20,8 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-18.04, ubuntu-20.04, macOS-10.15] # windows-2019, - python-version: [3.7, 3.8] + python-version: ["3.7", "3.8", "3.9", "3.10"] requirements: [latest] - exclude: - # pickle problems - - python-version: 3.8 - os: macOS-10.15 - - python-version: 3.6 - os: macOS-10.15 - # github CI problems -# - python-version: 3.8 -# os: ubuntu-18.04 -# requirements: minimal -# - python-version: 3.8 -# os: ubuntu-20.04 -# requirements: minimal -# - python-version: 3.7 -# os: ubuntu-18.04 -# requirements: minimal -# - python-version: 3.7 -# os: ubuntu-20.04 -# requirements: minimal -# - python-version: 3.7 -# os: macOS-10.15 -# requirements: minimal timeout-minutes: 60 steps: diff --git a/.github/workflows/dl_cpu_minimal.yml b/.github/workflows/dl_cpu_minimal.yml index 8fa551eaf5..2750f4cb35 100644 --- a/.github/workflows/dl_cpu_minimal.yml +++ b/.github/workflows/dl_cpu_minimal.yml @@ -20,32 +20,19 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-18.04, ubuntu-20.04, macOS-10.15] #, windows-2019, - python-version: [3.7, 3.8] + python-version: ["3.7", "3.8", "3.9", "3.10"] requirements: [minimal] exclude: - # pickle problems - - python-version: 3.8 - os: macOS-10.15 - - python-version: 3.6 - os: macOS-10.15 - # github CI problems - - python-version: 3.8 - os: ubuntu-18.04 + - python-version: 3.9 requirements: minimal - - python-version: 3.8 - os: ubuntu-20.04 + - python-version: 3.10 requirements: minimal - python-version: 3.7 os: macOS-10.15 -# - python-version: 3.7 -# os: ubuntu-18.04 -# requirements: minimal -# - python-version: 3.7 -# os: ubuntu-20.04 -# requirements: minimal -# - python-version: 3.7 -# os: macOS-10.15 -# requirements: minimal + requirements: minimal + - python-version: 3.8 + os: macOS-10.15 + requirements: minimal timeout-minutes: 60 steps: diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index 0db4a36398..5c42f1dfb9 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -20,19 +20,13 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-18.04, ubuntu-20.04] # windows-2019, - python-version: [3.7, 3.8] + python-version: ["3.7", "3.8", "3.9", "3.10"] requirements: [minimal, latest] exclude: - # pypi problems - - python-version: 3.8 - requirements: 'minimal' - - python-version: 3.7 - requirements: 'minimal' - # pickle problems - - python-version: 3.8 - os: macOS-10.15 - - python-version: 3.6 - os: macOS-10.15 + - python-version: 3.9 + requirements: minimal + - python-version: 3.10 + requirements: minimal timeout-minutes: 30 steps: diff --git a/bin/workflows/check_settings.sh b/bin/workflows/check_settings.sh index b9e43ab7f4..d46f2bf6c2 100644 --- a/bin/workflows/check_settings.sh +++ b/bin/workflows/check_settings.sh @@ -4,12 +4,15 @@ set -eo pipefail -v function clean_requirements() { -pip uninstall -r requirements/requirements-dev.txt -y +pip uninstall -r requirements/requirements-comet.txt -y pip uninstall -r requirements/requirements-cv.txt -y + pip uninstall -r requirements/requirements-deepspeed.txt -y + pip uninstall -r requirements/requirements-dev.txt -y pip uninstall -r requirements/requirements-ml.txt -y - pip uninstall -r requirements/requirements-optuna.txt -y pip uninstall -r requirements/requirements-mlflow.txt -y pip uninstall -r requirements/requirements-neptune.txt -y + pip uninstall -r requirements/requirements-optuna.txt -y + pip uninstall -r requirements/requirements-wandb.txt -y pip install -r requirements/requirements.txt --quiet \ --find-links https://download.pytorch.org/whl/cpu/torch_stable.html \ --upgrade-strategy only-if-needed diff --git a/catalyst/__version__.py b/catalyst/__version__.py index 7d80b6f334..66e26b383a 100644 --- a/catalyst/__version__.py +++ b/catalyst/__version__.py @@ -1 +1 @@ -__version__ = "22.02.1" +__version__ = "22.04" diff --git a/requirements/requirements-cv.txt b/requirements/requirements-cv.txt index 301a7f1174..b1b6cb0565 100644 --- a/requirements/requirements-cv.txt +++ b/requirements/requirements-cv.txt @@ -1,5 +1,5 @@ imageio>=2.5.0 -opencv-python-headless>=4.1.1.26 +opencv-python-headless>=4.2.0.32 scikit-image<0.19.0>=0.16.1 torchvision>=0.5.0 Pillow>=6.1 # torchvision fix (https://github.com/python-pillow/Pillow/issues/4130) diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index d7eb60e285..7b8f726058 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -1,4 +1,4 @@ -pytest==5.3.1 +pytest sphinx==2.2.1 Jinja2<=3.0.3 docutils==0.17.1 diff --git a/requirements/requirements-optuna.txt b/requirements/requirements-optuna.txt index 2af1f78471..143fdec567 100644 --- a/requirements/requirements-optuna.txt +++ b/requirements/requirements-optuna.txt @@ -1 +1 @@ -optuna>=2.0.0 +optuna>=2.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index a080d97990..0e4ab0970c 100755 --- a/setup.py +++ b/setup.py @@ -129,6 +129,8 @@ def load_version(): "Programming Language :: Python", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", ], )