From 2ff687e802250772f8614583af933d6613f87788 Mon Sep 17 00:00:00 2001 From: Sergey Kolesnikov Date: Mon, 29 Mar 2021 09:19:11 +0300 Subject: [PATCH] v21.03: minimal version fix (#1147) * minimal version fix * docs --- .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/workflows/intergarions.yml | 6 +++--- CHANGELOG.md | 10 ++++++++-- README.md | 2 +- catalyst/__version__.py | 2 +- catalyst/callbacks/onnx.py | 2 +- catalyst/callbacks/tracing.py | 2 +- requirements/requirements-cv.txt | 1 + 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 558219dcaf..c0f431fe81 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,6 +9,7 @@ - [ ] Did you check that your code passes the unit tests `pytest .` ? - [ ] Did you add your new functionality to the docs? - [ ] Did you update the [CHANGELOG](https://github.com/catalyst-team/catalyst/blob/master/CHANGELOG.md)? +- [ ] Did you run [colab minimal CI/CD](https://colab.research.google.com/drive/1JCGTVvWlrIsLXMPRRRSWiAstSLic4nbA) with `latest` and `minimal` requirements? diff --git a/.github/workflows/intergarions.yml b/.github/workflows/intergarions.yml index 8fbd2dfa1e..eed6ea9c4e 100644 --- a/.github/workflows/intergarions.yml +++ b/.github/workflows/intergarions.yml @@ -19,9 +19,9 @@ jobs: fail-fast: false max-parallel: 4 matrix: - os: [ubuntu-18.04] # windows-2019, - python-version: [3.7] - requirements: ['latest'] + os: [ubuntu-18.04, ubuntu-20.04] # windows-2019, + python-version: [3.6, 3.7, 3.8] + requirements: ['minimal', 'latest'] exclude: # pypi problems - python-version: 3.8 diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a7fe0043..1b32eb9554 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,13 +23,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - +## [21.03.2] - 2021-03-29 + +### Fixed + +- minimal requirements issue ([#1147](https://github.com/catalyst-team/catalyst/issues/1147)) + ## [21.03.1] - 2021-03-28 ### Added -- Additive Margin SoftMax(AMSoftmax)([#1125](https://github.com/catalyst-team/catalyst/issues/1125)) -- Generalized Mean Pooling(GeM)([#1084](https://github.com/catalyst-team/catalyst/issues/1084)) +- Additive Margin SoftMax(AMSoftmax) ([#1125](https://github.com/catalyst-team/catalyst/issues/1125)) +- Generalized Mean Pooling(GeM) ([#1084](https://github.com/catalyst-team/catalyst/issues/1084)) - Key-value support for CriterionCallback ([#1130](https://github.com/catalyst-team/catalyst/issues/1130)) - Engine configuration through cmd ([#1134](https://github.com/catalyst-team/catalyst/issues/1134)) - Extra utils for thresholds ([#1134](https://github.com/catalyst-team/catalyst/issues/1134)) diff --git a/README.md b/README.md index ec8cd673c1..67dbbff219 100644 --- a/README.md +++ b/README.md @@ -1365,7 +1365,7 @@ best practices for your deep learning research and development. ### Documentation - [master](https://catalyst-team.github.io/catalyst/) -- [21.03](https://catalyst-team.github.io/catalyst/v21.03/index.html), [21.03.1](https://catalyst-team.github.io/catalyst/v21.03.1/index.html) +- [21.03](https://catalyst-team.github.io/catalyst/v21.03/index.html), [21.03.1/21.03.2](https://catalyst-team.github.io/catalyst/v21.03.1/index.html) - [20.12](https://catalyst-team.github.io/catalyst/v20.12/index.html) - [20.11](https://catalyst-team.github.io/catalyst/v20.11/index.html) - [20.10](https://catalyst-team.github.io/catalyst/v20.10/index.html) diff --git a/catalyst/__version__.py b/catalyst/__version__.py index e8ff616d81..c5f370b7ed 100644 --- a/catalyst/__version__.py +++ b/catalyst/__version__.py @@ -1 +1 @@ -__version__ = "21.04" +__version__ = "21.03.2" diff --git a/catalyst/callbacks/onnx.py b/catalyst/callbacks/onnx.py index a3521880b3..abfeb72597 100644 --- a/catalyst/callbacks/onnx.py +++ b/catalyst/callbacks/onnx.py @@ -87,7 +87,7 @@ def __init__( """Init.""" super().__init__(order=CallbackOrder.ExternalExtra, node=CallbackNode.Master) if logdir is not None: - self.filename = Path(logdir) / filename + self.filename = str(Path(logdir) / filename) else: self.filename = filename # self.input_key = [input_key] if isinstance(input_key, str) else input_key diff --git a/catalyst/callbacks/tracing.py b/catalyst/callbacks/tracing.py index 15410ac934..0f925fa7be 100644 --- a/catalyst/callbacks/tracing.py +++ b/catalyst/callbacks/tracing.py @@ -131,7 +131,7 @@ def __init__( """ super().__init__(order=CallbackOrder.ExternalExtra, node=CallbackNode.Master) if logdir is not None: - self.filename = Path(logdir) / filename + self.filename = str(Path(logdir) / filename) else: self.filename = filename self.method_name = method_name diff --git a/requirements/requirements-cv.txt b/requirements/requirements-cv.txt index 1557a507dc..49db6374fd 100644 --- a/requirements/requirements-cv.txt +++ b/requirements/requirements-cv.txt @@ -2,3 +2,4 @@ imageio>=2.3.0 opencv-python-headless scikit-image>=0.14.2 torchvision>=0.4.1 +Pillow>=6.1 # torchvision fix (https://github.com/python-pillow/Pillow/issues/4130) \ No newline at end of file