From 4d0bc629ddec144883cef88265aa340e5560d61b Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:39:09 +0300 Subject: [PATCH 01/11] FIX: ci cache invalid --- .github/workflows/docs-on-pr.yml | 3 +-- .github/workflows/docs-unstable.yml | 2 +- .github/workflows/notebooks.yml | 2 +- .github/workflows/test.yml | 6 ++++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs-on-pr.yml b/.github/workflows/docs-on-pr.yml index fc83b135b..6f138af43 100644 --- a/.github/workflows/docs-on-pr.yml +++ b/.github/workflows/docs-on-pr.yml @@ -23,8 +23,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} - + key: venv-${{ runner.os }}-docs-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | diff --git a/.github/workflows/docs-unstable.yml b/.github/workflows/docs-unstable.yml index f46a607d7..b93b64950 100644 --- a/.github/workflows/docs-unstable.yml +++ b/.github/workflows/docs-unstable.yml @@ -24,7 +24,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-docs-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 7a84a724e..60583ecce 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -34,7 +34,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-notebook-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 739866a97..bffc463b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,6 +40,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python + id: setup-python uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} @@ -55,7 +56,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' @@ -81,6 +82,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python + id: setup-python uses: actions/setup-python@v2 with: python-version: 3.8 @@ -96,7 +98,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' From 10377ca67233a67af500217bd84170c104e69398 Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:41:37 +0300 Subject: [PATCH 02/11] FIX: key --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bffc463b3..229376b43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' @@ -98,7 +98,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' From f44fc9767e0e3be4231d382190670b9257facb5f Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:51:50 +0300 Subject: [PATCH 03/11] FIX: matrix --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 229376b43..896726279 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' @@ -98,7 +98,7 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.with.python-version }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' From 3d710fa9283a5c7ea76f8a0c791ffe834e09fabe Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:15:04 +0300 Subject: [PATCH 04/11] FIX: poetry update 1.12 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 896726279..a39454a8a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,7 +65,7 @@ jobs: - name: Install Pytest run: | - poetry install -E tests + poetry install --with tests - name: PyTest ("not long") run: | @@ -107,7 +107,7 @@ jobs: - name: Install Pytest run: | - poetry install -E tests + poetry install --with tests - name: PyTest ("long") run: | From 2853e9cc810317c267b0514e1280eac14fe5defe Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:30:25 +0300 Subject: [PATCH 05/11] FIX: ci --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a39454a8a..255314cae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,11 +61,11 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv + poetry install --with all,tests -vv - name: Install Pytest run: | - poetry install --with tests + poetry install --with tests,tests - name: PyTest ("not long") run: | @@ -103,11 +103,11 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv + poetry install --with all -vv - name: Install Pytest run: | - poetry install --with tests + poetry install --with all,tests - name: PyTest ("long") run: | From f24238b14f81fc69f86612c28b11acaea8f8bcff Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:31:58 +0300 Subject: [PATCH 06/11] FIX: ci --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 255314cae..5ba27cadd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,11 +61,11 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install --with all,tests -vv + poetry install --with all -vv - name: Install Pytest run: | - poetry install --with tests,tests + poetry install --with all,tests - name: PyTest ("not long") run: | From ed3591fa64238374abdf54fb2339919319592ad0 Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 14:41:11 +0300 Subject: [PATCH 07/11] FIX: ci --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ba27cadd..bf7d05a0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,11 +61,11 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install --with all -vv + poetry install -E all -vv - name: Install Pytest run: | - poetry install --with all,tests + poetry install -E "all tests" - name: PyTest ("not long") run: | @@ -103,11 +103,11 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install --with all -vv + poetry install -E all -vv - name: Install Pytest run: | - poetry install --with all,tests + poetry install -E "all tests" - name: PyTest ("long") run: | From 23636e11efe398612551625530114023567c2c23 Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:23:18 +0300 Subject: [PATCH 08/11] FIX: yaml --- .github/workflows/docs-on-pr.yml | 5 ++--- .github/workflows/docs-unstable.yml | 5 ++--- .github/workflows/notebooks.yml | 9 --------- .github/workflows/test.yml | 14 +++----------- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docs-on-pr.yml b/.github/workflows/docs-on-pr.yml index 6f138af43..42bc8c982 100644 --- a/.github/workflows/docs-on-pr.yml +++ b/.github/workflows/docs-on-pr.yml @@ -27,11 +27,10 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv - - name: Install docs dependencies + poetry install -E "all docs" -vv + - name: Install apt docs dependencies run: | sudo apt install pandoc - poetry install -E docs - name: Build docs run: | cd docs diff --git a/.github/workflows/docs-unstable.yml b/.github/workflows/docs-unstable.yml index b93b64950..5dbbe59e5 100644 --- a/.github/workflows/docs-unstable.yml +++ b/.github/workflows/docs-unstable.yml @@ -28,11 +28,10 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv - - name: Install docs dependencies + poetry install -E "all docs" -vv + - name: Install apt docs dependencies run: | sudo apt install pandoc - poetry install -E docs - name: Build docs run: | cd docs diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 60583ecce..744fa6f7f 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -28,16 +28,7 @@ jobs: with: virtualenvs-create: true virtualenvs-in-project: true - - - name: Load cached venv - id: cached-poetry-dependencies - uses: actions/cache@v2 - with: - path: .venv - key: venv-${{ runner.os }}-notebook-${{ hashFiles('**/poetry.lock') }} - - name: Install dependencies - if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | poetry install -E all -vv - name: Install Jupyter diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf7d05a0e..db56b8336 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,11 +61,7 @@ jobs: - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv - - - name: Install Pytest - run: | - poetry install -E "all tests" + poetry install -E "all tests" -vv - name: PyTest ("not long") run: | @@ -98,16 +94,12 @@ jobs: uses: actions/cache@v2 with: path: .venv - key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} + key: venv-${{ runner.os }}-3.8-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: | - poetry install -E all -vv - - - name: Install Pytest - run: | - poetry install -E "all tests" + poetry install -E "all tests" -vv - name: PyTest ("long") run: | From 35b601f2d80839174c301c0f41a7ba57077a1d2c Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:26:18 +0300 Subject: [PATCH 09/11] FIX: typing issue --- etna/commands/backtest_command.py | 2 +- etna/commands/forecast_command.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etna/commands/backtest_command.py b/etna/commands/backtest_command.py index 18a7e06a0..4d49f1992 100644 --- a/etna/commands/backtest_command.py +++ b/etna/commands/backtest_command.py @@ -2,7 +2,6 @@ from typing import Any from typing import Dict from typing import List -from typing import Literal from typing import Optional from typing import Sequence from typing import Union @@ -11,6 +10,7 @@ import pandas as pd import typer from omegaconf import OmegaConf +from typing_extensions import Literal from etna.datasets import TSDataset from etna.pipeline import Pipeline diff --git a/etna/commands/forecast_command.py b/etna/commands/forecast_command.py index 3b691a206..f67cdf0fa 100644 --- a/etna/commands/forecast_command.py +++ b/etna/commands/forecast_command.py @@ -2,7 +2,6 @@ from typing import Any from typing import Dict from typing import List -from typing import Literal from typing import Optional from typing import Sequence from typing import Union @@ -11,6 +10,7 @@ import pandas as pd import typer from omegaconf import OmegaConf +from typing_extensions import Literal from etna.datasets import TSDataset from etna.pipeline import Pipeline From c3f62d42ffdd2587bfe94218bc954876dadbff28 Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:50:51 +0300 Subject: [PATCH 10/11] FIX: changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b59de6d7..a656e2c86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - - - -- +- Fix ci invalid cache ([#896](https://github.com/tinkoff-ai/etna/pull/896)) - ## [1.11.1] - 2022-08-03 From 446bdebda6269f1de8fda375d481286b588b8de8 Mon Sep 17 00:00:00 2001 From: martins0n <33594071+martins0n@users.noreply.github.com> Date: Wed, 31 Aug 2022 18:01:05 +0300 Subject: [PATCH 11/11] FIX: notebooks ci --- .github/workflows/notebooks.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 744fa6f7f..755c46560 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -30,11 +30,7 @@ jobs: virtualenvs-in-project: true - name: Install dependencies run: | - poetry install -E all -vv - - name: Install Jupyter - run: | - poetry install -E release - poetry install -E jupyter + poetry install -E "all release jupyter" -vv - name: Notebook runner run: | poetry run python -m scripts.notebook_runner