From 4b88309102c4c9a642ff6bc5637551dca9937976 Mon Sep 17 00:00:00 2001 From: Tomer Saban Date: Tue, 4 Oct 2022 12:29:50 +0300 Subject: [PATCH 1/5] Moving requirement to handle flake8 issue to the CI instead of the requirements.txt --- .github/workflows/lint.yml | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 580e79fe..7340f86a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,6 +22,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 pip install -r requirements.txt pip install -r dev-requirements.txt diff --git a/requirements.txt b/requirements.txt index 23182dff..c88bc431 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ dataclasses~=0.8; python_version < '3.7' typing-extensions>=4.1.0 pyelftools~=0.28 packaging~=21.2 -importlib_metadata~=4.8 From 246c2d5ee8210bc70a82d56281cfc14eb520660a Mon Sep 17 00:00:00 2001 From: Tomer Saban Date: Tue, 4 Oct 2022 12:31:50 +0300 Subject: [PATCH 2/5] fix --- .github/workflows/glogger.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/glogger.yml b/.github/workflows/glogger.yml index 612c9d43..d037dc93 100644 --- a/.github/workflows/glogger.yml +++ b/.github/workflows/glogger.yml @@ -42,6 +42,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 pip install -r requirements.txt pip install -r dev-requirements.txt From e52e1ab148822b25235008f6cb2cec85549cf07d Mon Sep 17 00:00:00 2001 From: Tomer Saban Date: Tue, 4 Oct 2022 12:34:08 +0300 Subject: [PATCH 3/5] fix --- .github/workflows/glogger.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/glogger.yml b/.github/workflows/glogger.yml index d037dc93..7953f7de 100644 --- a/.github/workflows/glogger.yml +++ b/.github/workflows/glogger.yml @@ -42,9 +42,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 pip install -r requirements.txt pip install -r dev-requirements.txt + pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Install self run: pip install -e . diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7340f86a..d2f37312 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,9 +22,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 pip install -r requirements.txt pip install -r dev-requirements.txt + pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Run linters run: ./lint.sh --ci From 87a939ea0e13317180ee02e709ac5c32f7184743 Mon Sep 17 00:00:00 2001 From: Tomer Saban Date: Tue, 4 Oct 2022 12:41:48 +0300 Subject: [PATCH 4/5] fix --- .github/workflows/glogger.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/glogger.yml b/.github/workflows/glogger.yml index 7953f7de..993181bc 100644 --- a/.github/workflows/glogger.yml +++ b/.github/workflows/glogger.yml @@ -24,6 +24,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r dev-requirements.txt + pip install --force-reinstall importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Run linters run: ./lint.sh --ci @@ -44,7 +45,6 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r dev-requirements.txt - pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Install self run: pip install -e . diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d2f37312..83843215 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r dev-requirements.txt - pip install importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 + pip install --force-reinstall importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Run linters run: ./lint.sh --ci From 4710782c42d35b764d2faa09a6599756731dc3c3 Mon Sep 17 00:00:00 2001 From: Tomer Saban Date: Tue, 4 Oct 2022 12:59:41 +0300 Subject: [PATCH 5/5] fix --- .github/workflows/glogger.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/glogger.yml b/.github/workflows/glogger.yml index 993181bc..4ba9342e 100644 --- a/.github/workflows/glogger.yml +++ b/.github/workflows/glogger.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r dev-requirements.txt - pip install --force-reinstall importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 + pip install --force-reinstall importlib_metadata~=4.8 # Added requirement separately since it stems from an errorneous lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Run linters run: ./lint.sh --ci diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 83843215..886779c2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r dev-requirements.txt - pip install --force-reinstall importlib_metadata~=4.8 # Added separately since it stems from an error lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 + pip install --force-reinstall importlib_metadata~=4.8 # Added requirement separately since it stems from an errorneous lint. See the following link for more details: https://github.com/Granulate/granulate-utils/pull/82#discussion_r985745999 - name: Run linters run: ./lint.sh --ci