From 12586c86ca13d2cedd0023c4e80824e8374326ac Mon Sep 17 00:00:00 2001 From: Jan Koscisz Date: Fri, 31 Jul 2020 13:50:39 +0200 Subject: [PATCH 1/5] Set version to be fixed. Revert prefix 'clear' in worfklows --- .github/workflows/develop.yml | 8 ++++---- .github/workflows/merge.yml | 8 ++++---- requirements/dev.txt | 6 +++--- requirements/main.txt | 28 ++++++++++++++-------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 956e737ab1..9a8b51c2a6 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -31,9 +31,9 @@ jobs: id: cache with: path: ~/.cache/pip - key: clear-tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} + key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} restore-keys: | - clear-tests-${{ runner.os }}-pip- + tests-${{ runner.os }}-pip- - name: "5. Tests" run: | @@ -64,9 +64,9 @@ jobs: id: cache with: path: ~/.cache/pip - key: clear-release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} + key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} restore-keys: | - clear-release-${{ runner.os }}-pip- + release-${{ runner.os }}-pip- - name: "6. Build docs" run: | diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 42a4d768c7..5d55a82693 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,9 +34,9 @@ jobs: id: cache with: path: ~/.cache/pip - key: clear-tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} + key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} restore-keys: | - clear-tests-${{ runner.os }}-pip- + tests-${{ runner.os }}-pip- - name: "5. Tests" run: | @@ -85,9 +85,9 @@ jobs: id: cache with: path: ~/.cache/pip - key: clear-release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} + key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} restore-keys: | - clear-release-${{ runner.os }}-pip- + release-${{ runner.os }}-pip- - name: "6. Build docs" run: | diff --git a/requirements/dev.txt b/requirements/dev.txt index 594799bc51..66cc5efecf 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,6 +1,6 @@ # tests -testfixtures>=6.14.0 -coverage>=5.1 +testfixtures==6.14.0 +coverage==5.1 # linters -flake8>=3.7.9 \ No newline at end of file +flake8==3.7.9 \ No newline at end of file diff --git a/requirements/main.txt b/requirements/main.txt index a960796f12..e94d11151b 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -1,14 +1,14 @@ -numpy>=1.18.1 -scipy>=1.4.1 -statsmodels>=0.11.1 -pmdarima>=1.5.3 -matplotlib>=3.2.1 -fbprophet>=0.6 -pandas>=0.23.1 -torch>=1.4.0 -tensorboard>=2.1.1 -ipython>=7.14.0 -tqdm>=4.46.0 -holidays>=0.10.2 -plotly>=4.8.2 -ipywidgets>=7.5.1 \ No newline at end of file +numpy==1.18.1 +scipy==1.4.1 +statsmodels==0.11.1 +pmdarima==1.5.3 +matplotlib==3.2.1 +fbprophet==0.6 +pandas==0.23.1 +torch==1.4.0 +tensorboard==2.1.1 +ipython==7.14.0 +tqdm==4.46.0 +holidays==0.10.2 +plotly==4.8.2 +ipywidgets==7.5.1 \ No newline at end of file From 7e6e01bb015a96328e23dc7d98a16c487697ff91 Mon Sep 17 00:00:00 2001 From: Jan Koscisz Date: Fri, 31 Jul 2020 14:20:33 +0200 Subject: [PATCH 2/5] Delete restore-key --- .github/workflows/develop.yml | 4 ---- .github/workflows/merge.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 9a8b51c2a6..8e48329bf3 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -32,8 +32,6 @@ jobs: with: path: ~/.cache/pip key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} - restore-keys: | - tests-${{ runner.os }}-pip- - name: "5. Tests" run: | @@ -65,8 +63,6 @@ jobs: with: path: ~/.cache/pip key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - restore-keys: | - release-${{ runner.os }}-pip- - name: "6. Build docs" run: | diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 5d55a82693..7407d2675c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -35,8 +35,6 @@ jobs: with: path: ~/.cache/pip key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} - restore-keys: | - tests-${{ runner.os }}-pip- - name: "5. Tests" run: | @@ -86,8 +84,6 @@ jobs: with: path: ~/.cache/pip key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - restore-keys: | - release-${{ runner.os }}-pip- - name: "6. Build docs" run: | From aea6c443451d1dfb29056e6de8db41bd2b6c6f1d Mon Sep 17 00:00:00 2001 From: Jan Koscisz Date: Fri, 31 Jul 2020 14:39:56 +0200 Subject: [PATCH 3/5] Update versions in requirements. --- requirements/main.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements/main.txt b/requirements/main.txt index e94d11151b..ecae9c00c9 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -1,14 +1,14 @@ -numpy==1.18.1 -scipy==1.4.1 +numpy==1.19.0 +scipy==1.5.0 statsmodels==0.11.1 -pmdarima==1.5.3 -matplotlib==3.2.1 +pmdarima==1.6.1 +matplotlib==3.2.2 fbprophet==0.6 -pandas==0.23.1 -torch==1.4.0 -tensorboard==2.1.1 -ipython==7.14.0 -tqdm==4.46.0 +pandas==1.1.0 +torch==1.5.1 +tensorboard==2.2.2 +ipython==7.15.0 +tqdm==4.46.1 holidays==0.10.2 -plotly==4.8.2 +plotly==4.9.0 ipywidgets==7.5.1 \ No newline at end of file From 993d329bd534988fb697a66c0c1f34b5e7efa117 Mon Sep 17 00:00:00 2001 From: Jan Koscisz Date: Fri, 31 Jul 2020 15:14:35 +0200 Subject: [PATCH 4/5] add python version to cache key --- .github/workflows/develop.yml | 4 ++-- .github/workflows/merge.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 8e48329bf3..85a8d4bcae 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -31,7 +31,7 @@ jobs: id: cache with: path: ~/.cache/pip - key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} + key: tests-${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} - name: "5. Tests" run: | @@ -62,7 +62,7 @@ jobs: id: cache with: path: ~/.cache/pip - key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} + key: release-${{ runner.os }}-3.6-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - name: "6. Build docs" run: | diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 7407d2675c..85c097d6a1 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,7 +34,7 @@ jobs: id: cache with: path: ~/.cache/pip - key: tests-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} + key: tests-${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/dev.txt') }} - name: "5. Tests" run: | @@ -83,7 +83,7 @@ jobs: id: cache with: path: ~/.cache/pip - key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} + key: release-${{ runner.os }}-3.6-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - name: "6. Build docs" run: | From 2e3be43629ddc886b72b756922c82df194d2ee88 Mon Sep 17 00:00:00 2001 From: Jan Koscisz Date: Fri, 31 Jul 2020 15:30:14 +0200 Subject: [PATCH 5/5] Rename key for doc --- .github/workflows/develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 85a8d4bcae..3a68c9b66d 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -62,7 +62,7 @@ jobs: id: cache with: path: ~/.cache/pip - key: release-${{ runner.os }}-3.6-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} + key: tests-${{ runner.os }}-3.6-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - name: "6. Build docs" run: |