From d8679798343ab76e4c65c278799f81cb72424aea Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 13 Feb 2022 10:22:31 +0100 Subject: [PATCH 1/5] pyupgrade --py310-plus and run mypy in precommit, not build --- .github/workflows/build.yml | 5 +---- .pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aabfacbfc327..403ec44c888d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install mypy pytest-cov -r requirements.txt - - run: | - mkdir -p .mypy_cache - mypy --ignore-missing-imports --install-types --non-interactive . || true + python -m pip install pytest-cov -r requirements.txt - name: Run tests run: pytest --doctest-modules --ignore=project_euler/ --ignore=scripts/validate_solutions.py --cov-report=term-missing:skip-covered --cov=. . - if: ${{ success() }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 33069a807cee..ab74d28e167a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: hooks: - id: pyupgrade args: - - --py39-plus + - --py310-plus - repo: https://gitlab.com/pycqa/flake8 rev: 3.9.2 From ed3c20e412d973c377388412d82523cef1a5d26f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 13 Feb 2022 10:31:17 +0100 Subject: [PATCH 2/5] pyupgrade --py310-plus web_programming/fetch_well_rx_price.py --- web_programming/fetch_well_rx_price.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_programming/fetch_well_rx_price.py b/web_programming/fetch_well_rx_price.py index 58dbe5993adb..ef2a29f7d486 100644 --- a/web_programming/fetch_well_rx_price.py +++ b/web_programming/fetch_well_rx_price.py @@ -14,7 +14,7 @@ BASE_URL = "https://www.wellrx.com/prescriptions/{0}/{1}/?freshSearch=true" -def fetch_pharmacy_and_price_list(drug_name: str, zip_code: str) -> Union[list, None]: +def fetch_pharmacy_and_price_list(drug_name: str, zip_code: str) -> list | None: """[summary] This function will take input of drug name and zipcode, @@ -85,7 +85,7 @@ def fetch_pharmacy_and_price_list(drug_name: str, zip_code: str) -> Union[list, drug_name = input("Enter drug name: ").strip() zip_code = input("Enter zip code: ").strip() - pharmacy_price_list: Union[list, None] = fetch_pharmacy_and_price_list( + pharmacy_price_list: list | None = fetch_pharmacy_and_price_list( drug_name, zip_code ) From b74b4ccf1e979149c802f4f1ff29bc0d463e16a9 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 13 Feb 2022 10:35:35 +0100 Subject: [PATCH 3/5] pyupgrade --py310-plus web_programming/fetch_well_rx_price.py --- web_programming/fetch_well_rx_price.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web_programming/fetch_well_rx_price.py b/web_programming/fetch_well_rx_price.py index ef2a29f7d486..5174f39f9532 100644 --- a/web_programming/fetch_well_rx_price.py +++ b/web_programming/fetch_well_rx_price.py @@ -5,7 +5,6 @@ """ -from typing import Union from urllib.error import HTTPError from bs4 import BeautifulSoup From ddbb89b79629594901590987396ebc4ffcec9d8a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 13 Feb 2022 10:45:17 +0100 Subject: [PATCH 4/5] Fix arithmetic_analysis/in_static_equilibrium.py --- arithmetic_analysis/in_static_equilibrium.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arithmetic_analysis/in_static_equilibrium.py b/arithmetic_analysis/in_static_equilibrium.py index 6fe84b45475c..20207b6db5c8 100644 --- a/arithmetic_analysis/in_static_equilibrium.py +++ b/arithmetic_analysis/in_static_equilibrium.py @@ -13,7 +13,7 @@ def polar_force( Resolves force along rectangular components. (force, angle) => (force_x, force_y) >>> polar_force(10, 45) - [7.0710678118654755, 7.071067811865475] + [7.071067811865477, 7.0710678118654755] >>> polar_force(10, 3.14, radian_mode=True) [-9.999987317275394, 0.01592652916486828] """ From 4001120223fdb1d9ded75f8f860e12a8813e74df Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 13 Feb 2022 10:50:10 +0100 Subject: [PATCH 5/5] Fix arithmetic_analysis/in_static_equilibrium.py --- arithmetic_analysis/in_static_equilibrium.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arithmetic_analysis/in_static_equilibrium.py b/arithmetic_analysis/in_static_equilibrium.py index 20207b6db5c8..2ac3e7213fda 100644 --- a/arithmetic_analysis/in_static_equilibrium.py +++ b/arithmetic_analysis/in_static_equilibrium.py @@ -15,7 +15,7 @@ def polar_force( >>> polar_force(10, 45) [7.071067811865477, 7.0710678118654755] >>> polar_force(10, 3.14, radian_mode=True) - [-9.999987317275394, 0.01592652916486828] + [-9.999987317275396, 0.01592652916486828] """ if radian_mode: return [magnitude * cos(angle), magnitude * sin(angle)]