From 8fe2f2cf5bba36b1e641e00ce36d143122478256 Mon Sep 17 00:00:00 2001 From: Alex Kerney Date: Fri, 2 Dec 2022 15:17:11 -0500 Subject: [PATCH 1/2] Bump all sorts of dependencies to hopefully unblock dependabot --- .pre-commit-config.yaml | 2 +- app/buoy_barn/settings.py | 2 +- app/poetry.lock | 171 +++++++++++++++----------------------- app/pyproject.toml | 7 +- 4 files changed, 71 insertions(+), 111 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30465074..27635667 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,7 +105,7 @@ repos: hooks: - id: pyupgrade args: - - --py39-plus + - --py310-plus - repo: https://github.com/asottile/add-trailing-comma rev: v2.3.0 diff --git a/app/buoy_barn/settings.py b/app/buoy_barn/settings.py index 518ee161..98945685 100644 --- a/app/buoy_barn/settings.py +++ b/app/buoy_barn/settings.py @@ -87,7 +87,7 @@ def before_send(event, hint): "health_check", "health_check.db", "health_check.cache", - "health_check.contrib.celery_ping", + # "health_check.contrib.celery_ping", # User management "account.apps.AccountConfig", # Dataset and forecast management diff --git a/app/poetry.lock b/app/poetry.lock index fab74808..4825a1af 100644 --- a/app/poetry.lock +++ b/app/poetry.lock @@ -30,7 +30,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "astroid" -version = "2.12.12" +version = "2.12.13" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false @@ -38,7 +38,6 @@ python-versions = ">=3.7.2" [package.dependencies] lazy-object-proxy = ">=1.4.0" -typing-extensions = {version = ">=3.10", markers = "python_version < \"3.10\""} wrapt = [ {version = ">=1.11,<2", markers = "python_version < \"3.11\""}, {version = ">=1.14,<2", markers = "python_version >= \"3.11\""}, @@ -46,7 +45,7 @@ wrapt = [ [[package]] name = "asttokens" -version = "2.0.8" +version = "2.2.0" description = "Annotate AST trees with source code positions" category = "dev" optional = false @@ -56,7 +55,7 @@ python-versions = "*" six = "*" [package.extras] -test = ["astroid (<=2.5.3)", "pytest"] +test = ["astroid", "pytest"] [[package]] name = "async-timeout" @@ -258,7 +257,7 @@ toml = ["tomli"] [[package]] name = "croniter" -version = "1.3.7" +version = "1.3.8" description = "croniter provides iteration for datetime object with cron like format" category = "main" optional = false @@ -269,13 +268,14 @@ python-dateutil = "*" [[package]] name = "dask" -version = "2022.10.0" +version = "2022.11.1" description = "Parallel PyData with Task Scheduling" category = "main" optional = false python-versions = ">=3.8" [package.dependencies] +click = ">=7.0" cloudpickle = ">=1.1.1" fsspec = ">=0.6.0" packaging = ">=20.0" @@ -285,10 +285,10 @@ toolz = ">=0.8.2" [package.extras] array = ["numpy (>=1.18)"] -complete = ["bokeh (>=2.4.2)", "distributed (==2022.10.0)", "jinja2", "numpy (>=1.18)", "pandas (>=1.0)"] +complete = ["bokeh (>=2.4.2,<3)", "distributed (==2022.11.1)", "jinja2", "numpy (>=1.18)", "pandas (>=1.0)"] dataframe = ["numpy (>=1.18)", "pandas (>=1.0)"] -diagnostics = ["bokeh (>=2.4.2)", "jinja2"] -distributed = ["distributed (==2022.10.0)"] +diagnostics = ["bokeh (>=2.4.2,<3)", "jinja2"] +distributed = ["distributed (==2022.11.1)"] test = ["pandas", "pytest", "pytest-rerunfailures", "pytest-xdist", "pre-commit"] [[package]] @@ -299,20 +299,6 @@ category = "dev" optional = false python-versions = ">=3.5" -[[package]] -name = "deprecated" -version = "1.2.13" -description = "Python @deprecated decorator to deprecate old python classes, functions or methods." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[package.dependencies] -wrapt = ">=1.10,<2" - -[package.extras] -dev = ["tox", "bump2version (<1)", "sphinx (<2)", "importlib-metadata (<3)", "importlib-resources (<4)", "configparser (<5)", "sphinxcontrib-websupport (<2)", "zipp (<2)", "PyTest (<5)", "PyTest-Cov (<2.6)", "pytest", "pytest-cov"] - [[package]] name = "dill" version = "0.3.6" @@ -326,16 +312,16 @@ graph = ["objgraph (>=1.7.2)"] [[package]] name = "distributed" -version = "2022.10.0" +version = "2022.11.1" description = "Distributed scheduler for Dask" category = "main" optional = false python-versions = ">=3.8" [package.dependencies] -click = ">=6.6" +click = ">=7.0" cloudpickle = ">=1.5.0" -dask = "2022.10.0" +dask = "2022.11.1" jinja2 = "*" locket = ">=1.0.0" msgpack = ">=0.6.0" @@ -344,14 +330,14 @@ psutil = ">=5.0" pyyaml = "*" sortedcontainers = "<2.0.0 || >2.0.0,<2.0.1 || >2.0.1" tblib = ">=1.6.0" -toolz = ">=0.8.2" +toolz = ">=0.10.0" tornado = ">=6.0.3,<6.2" urllib3 = "*" zict = ">=0.1.3" [[package]] name = "django" -version = "4.1.2" +version = "4.1.3" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." category = "main" optional = false @@ -455,7 +441,7 @@ djangorestframework = "*" [[package]] name = "docker" -version = "6.0.0" +version = "6.0.1" description = "A Python library for the Docker Engine API." category = "main" optional = false @@ -493,7 +479,7 @@ requests = "*" [[package]] name = "exceptiongroup" -version = "1.0.0" +version = "1.0.4" description = "Backport of PEP 654 (exception groups)" category = "dev" optional = false @@ -504,7 +490,7 @@ test = ["pytest (>=6)"] [[package]] name = "executing" -version = "1.1.1" +version = "1.2.0" description = "Get the currently executing AST node of a frame, and other information" category = "dev" optional = false @@ -550,7 +536,7 @@ python-dateutil = ">=2.7" [[package]] name = "fsspec" -version = "2022.10.0" +version = "2022.11.0" description = "File-system specification" category = "main" optional = false @@ -633,9 +619,6 @@ category = "main" optional = false python-versions = ">=3.7" -[package.dependencies] -zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} - [package.extras] docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "jaraco.tidelift (>=1.4)"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "flake8 (<5)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"] @@ -650,7 +633,7 @@ python-versions = "*" [[package]] name = "ipython" -version = "8.5.0" +version = "8.7.0" description = "IPython: Productive Interactive Computing" category = "dev" optional = false @@ -665,15 +648,15 @@ jedi = ">=0.16" matplotlib-inline = "*" pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""} pickleshare = "*" -prompt-toolkit = ">3.0.1,<3.1.0" +prompt-toolkit = ">=3.0.11,<3.1.0" pygments = ">=2.4.0" stack-data = "*" traitlets = ">=5" [package.extras] -all = ["black", "Sphinx (>=1.3)", "ipykernel", "nbconvert", "nbformat", "ipywidgets", "notebook", "ipyparallel", "qtconsole", "pytest (<7.1)", "pytest-asyncio", "testpath", "curio", "matplotlib (!=3.2.0)", "numpy (>=1.19)", "pandas", "trio"] +all = ["black", "ipykernel", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "docrepr", "matplotlib", "stack-data", "pytest (<7)", "typing-extensions", "pytest (<7.1)", "pytest-asyncio", "testpath", "nbconvert", "nbformat", "ipywidgets", "notebook", "ipyparallel", "qtconsole", "curio", "matplotlib (!=3.2.0)", "numpy (>=1.20)", "pandas", "trio"] black = ["black"] -doc = ["Sphinx (>=1.3)"] +doc = ["ipykernel", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "docrepr", "matplotlib", "stack-data", "pytest (<7)", "typing-extensions", "pytest (<7.1)", "pytest-asyncio", "testpath"] kernel = ["ipykernel"] nbconvert = ["nbconvert"] nbformat = ["nbformat"] @@ -681,7 +664,7 @@ notebook = ["ipywidgets", "notebook"] parallel = ["ipyparallel"] qtconsole = ["qtconsole"] test = ["pytest (<7.1)", "pytest-asyncio", "testpath"] -test_extra = ["pytest (<7.1)", "pytest-asyncio", "testpath", "curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.19)", "pandas", "trio"] +test_extra = ["pytest (<7.1)", "pytest-asyncio", "testpath", "curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.20)", "pandas", "trio"] [[package]] name = "isort" @@ -699,7 +682,7 @@ plugins = ["setuptools"] [[package]] name = "jedi" -version = "0.18.1" +version = "0.18.2" description = "An autocompletion tool for Python that can be used for text editors." category = "dev" optional = false @@ -709,8 +692,9 @@ python-versions = ">=3.6" parso = ">=0.8.0,<0.9.0" [package.extras] +docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alabaster (==0.7.12)", "babel (==2.9.1)", "chardet (==4.0.0)", "commonmark (==0.8.1)", "docutils (==0.17.1)", "future (==0.18.2)", "idna (==2.10)", "imagesize (==1.2.0)", "mock (==1.0.1)", "packaging (==20.9)", "pyparsing (==2.4.7)", "pytz (==2021.1)", "readthedocs-sphinx-ext (==2.1.4)", "recommonmark (==0.5.0)", "requests (==2.25.1)", "six (==1.15.0)", "snowballstemmer (==2.1.0)", "sphinx-rtd-theme (==0.4.3)", "sphinx (==1.8.5)", "sphinxcontrib-serializinghtml (==1.1.4)", "sphinxcontrib-websupport (==1.2.4)", "urllib3 (==1.26.4)"] qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] -testing = ["Django (<3.1)", "colorama", "docopt", "pytest (<7.0.0)"] +testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] [[package]] name = "jinja2" @@ -780,7 +764,7 @@ python-versions = ">=3.7" [[package]] name = "marshmallow" -version = "3.18.0" +version = "3.19.0" description = "A lightweight library for converting complex datatypes to and from native Python datatypes." category = "main" optional = false @@ -790,9 +774,9 @@ python-versions = ">=3.7" packaging = ">=17.0" [package.extras] -dev = ["pytest", "pytz", "simplejson", "mypy (==0.971)", "flake8 (==5.0.4)", "flake8-bugbear (==22.9.11)", "pre-commit (>=2.4,<3.0)", "tox"] -docs = ["sphinx (==5.1.1)", "sphinx-issues (==3.0.1)", "alabaster (==0.7.12)", "sphinx-version-warning (==1.1.2)", "autodocsumm (==0.2.9)"] -lint = ["mypy (==0.971)", "flake8 (==5.0.4)", "flake8-bugbear (==22.9.11)", "pre-commit (>=2.4,<3.0)"] +dev = ["pytest", "pytz", "simplejson", "mypy (==0.990)", "flake8 (==5.0.4)", "flake8-bugbear (==22.10.25)", "pre-commit (>=2.4,<3.0)", "tox"] +docs = ["sphinx (==5.3.0)", "sphinx-issues (==3.0.1)", "alabaster (==0.7.12)", "sphinx-version-warning (==1.1.2)", "autodocsumm (==0.2.9)"] +lint = ["mypy (==0.990)", "flake8 (==5.0.4)", "flake8-bugbear (==22.10.25)", "pre-commit (>=2.4,<3.0)"] tests = ["pytest", "pytz", "simplejson"] [[package]] @@ -856,11 +840,11 @@ python-versions = "*" [[package]] name = "netcdf4" -version = "1.6.1" +version = "1.6.2" description = "Provides an object-oriented python interface to the netCDF version 4 library." category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [package.dependencies] cftime = "*" @@ -868,7 +852,7 @@ numpy = ">=1.9" [[package]] name = "numpy" -version = "1.23.4" +version = "1.23.5" description = "NumPy is the fundamental package for array computing with Python." category = "main" optional = false @@ -887,7 +871,7 @@ pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" [[package]] name = "pandas" -version = "1.5.1" +version = "1.5.2" description = "Powerful data structures for data analysis, time series, and statistics" category = "main" optional = false @@ -895,8 +879,8 @@ python-versions = ">=3.8" [package.dependencies] numpy = [ - {version = ">=1.20.3", markers = "python_version < \"3.10\""}, {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, + {version = ">=1.23.2", markers = "python_version >= \"3.11\""}, ] python-dateutil = ">=2.8.1" pytz = ">=2020.1" @@ -983,15 +967,15 @@ python-versions = "*" [[package]] name = "platformdirs" -version = "2.5.2" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +version = "2.5.4" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "dev" optional = false python-versions = ">=3.7" [package.extras] -docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"] -test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"] +docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"] +test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"] [[package]] name = "pluggy" @@ -1099,7 +1083,7 @@ viz = ["graphviz (>=0.8.3)"] [[package]] name = "prompt-toolkit" -version = "3.0.31" +version = "3.0.33" description = "Library for building powerful interactive command lines in Python" category = "main" optional = false @@ -1143,7 +1127,7 @@ with-vulture = ["vulture (>=1.5)"] [[package]] name = "psutil" -version = "5.9.3" +version = "5.9.4" description = "Cross-platform lib for process and system monitoring in Python." category = "main" optional = false @@ -1222,14 +1206,14 @@ plugins = ["importlib-metadata"] [[package]] name = "pylint" -version = "2.15.5" +version = "2.15.7" description = "python code static checker" category = "dev" optional = false python-versions = ">=3.7.2" [package.dependencies] -astroid = ">=2.12.12,<=2.14.0-dev0" +astroid = ">=2.12.13,<=2.14.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = ">=0.2" isort = ">=4.2.5,<6" @@ -1237,7 +1221,6 @@ mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} tomlkit = ">=0.10.1" -typing-extensions = {version = ">=3.10.0", markers = "python_version < \"3.10\""} [package.extras] spelling = ["pyenchant (>=3.2,<4.0)"] @@ -1327,7 +1310,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2. [[package]] name = "pytest-cov" -version = "3.0.0" +version = "4.0.0" description = "Pytest plugin for measuring coverage." category = "dev" optional = false @@ -1357,11 +1340,11 @@ testing = ["django", "django-configurations (>=2.0)"] [[package]] name = "python-box" -version = "6.0.2" +version = "6.1.0" description = "Advanced Python dictionaries with dot notation access" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.extras] pyyaml = ["pyyaml"] @@ -1369,6 +1352,7 @@ all = ["ruamel.yaml (>=0.17)", "toml", "msgpack"] msgpack = ["msgpack"] "ruamel.yaml" = ["ruamel.yaml (>=0.17)"] toml = ["toml"] +tomli = ["tomli-w", "tomli"] yaml = ["ruamel.yaml (>=0.17)"] [[package]] @@ -1384,11 +1368,11 @@ six = ">=1.5" [[package]] name = "python-slugify" -version = "6.1.2" +version = "7.0.0" description = "A Python slugify application that also handles Unicode" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7" [package.dependencies] text-unidecode = ">=1.3" @@ -1398,7 +1382,7 @@ unidecode = ["Unidecode (>=1.1.1)"] [[package]] name = "pytz" -version = "2022.5" +version = "2022.6" description = "World timezone definitions, modern and historical" category = "main" optional = false @@ -1414,7 +1398,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pywin32" -version = "304" +version = "305" description = "Python for Window Extensions" category = "main" optional = false @@ -1430,7 +1414,7 @@ python-versions = ">=3.6" [[package]] name = "redis" -version = "4.3.4" +version = "4.3.5" description = "Python client for Redis database and key-value store" category = "main" optional = false @@ -1438,7 +1422,6 @@ python-versions = ">=3.6" [package.dependencies] async-timeout = ">=4.0.2" -deprecated = ">=1.2.3" packaging = ">=20.4" [package.extras] @@ -1479,7 +1462,7 @@ toml = ">=0.10.2,<0.11.0" [[package]] name = "sentry-sdk" -version = "1.10.1" +version = "1.11.1" description = "Python client for Sentry (https://sentry.io)" category = "main" optional = false @@ -1501,6 +1484,7 @@ fastapi = ["fastapi (>=0.79.0)"] flask = ["flask (>=0.11)", "blinker (>=1.1)"] httpx = ["httpx (>=0.16.0)"] pure_eval = ["pure-eval", "executing", "asttokens"] +pymongo = ["pymongo (>=3.1)"] pyspark = ["pyspark (>=2.4.4)"] quart = ["quart (>=0.16.1)", "blinker (>=1.1)"] rq = ["rq (>=0.6)"] @@ -1562,15 +1546,15 @@ python-versions = ">=3.5" [[package]] name = "stack-data" -version = "0.5.1" +version = "0.6.2" description = "Extract data from python stack frames and tracebacks for informative displays" category = "dev" optional = false python-versions = "*" [package.dependencies] -asttokens = "*" -executing = "*" +asttokens = ">=2.1.0" +executing = ">=1.2.0" pure-eval = "*" [package.extras] @@ -1645,8 +1629,8 @@ python-versions = ">= 3.5" [[package]] name = "traitlets" -version = "5.5.0" -description = "" +version = "5.6.0" +description = "Traitlets Python configuration system" category = "dev" optional = false python-versions = ">=3.7" @@ -1655,17 +1639,9 @@ python-versions = ">=3.7" docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"] test = ["pre-commit", "pytest"] -[[package]] -name = "typing-extensions" -version = "4.4.0" -description = "Backported and Experimental Type Hints for Python 3.7+" -category = "dev" -optional = false -python-versions = ">=3.7" - [[package]] name = "tzdata" -version = "2022.5" +version = "2022.7" description = "Provider of IANA time zone data" category = "main" optional = false @@ -1673,11 +1649,11 @@ python-versions = ">=2" [[package]] name = "urllib3" -version = "1.26.12" +version = "1.26.13" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.extras] brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] @@ -1724,7 +1700,7 @@ python-versions = "*" [[package]] name = "websocket-client" -version = "1.4.1" +version = "1.4.2" description = "WebSocket client for Python with low level API options" category = "main" optional = false @@ -1756,7 +1732,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [[package]] name = "xarray" -version = "2022.10.0" +version = "2022.11.0" description = "N-D labeled arrays and datasets in Python" category = "main" optional = false @@ -1798,22 +1774,10 @@ python-versions = ">=3.7" [package.dependencies] heapdict = "*" -[[package]] -name = "zipp" -version = "3.10.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "jaraco.tidelift (>=1.4)"] -testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "flake8 (<5)", "pytest-cov", "pytest-enabler (>=1.3)", "jaraco.itertools", "func-timeout", "jaraco.functools", "more-itertools", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"] - [metadata] lock-version = "1.1" -python-versions = "^3.9" -content-hash = "cf6a49d9c3b6760f3f476a2f071a82fa098dbe8339108061f966281fb3cfe4d6" +python-versions = "^3.10" +content-hash = "c2dc988b8c8e21c4155063ac51ae943e48656af7bdfcaf0617db5dfedc0231e8" [metadata.files] amqp = [] @@ -1839,7 +1803,6 @@ coverage = [] croniter = [] dask = [] decorator = [] -deprecated = [] dill = [] distributed = [] django = [] @@ -1942,7 +1905,6 @@ tomlkit = [] toolz = [] tornado = [] traitlets = [] -typing-extensions = [] tzdata = [] urllib3 = [] uwsgi = [] @@ -1955,4 +1917,3 @@ wrapt = [] xarray = [] yarl = [] zict = [] -zipp = [] diff --git a/app/pyproject.toml b/app/pyproject.toml index 65b9610b..59b142e5 100644 --- a/app/pyproject.toml +++ b/app/pyproject.toml @@ -6,7 +6,7 @@ description = "NERACOOS lightweight API sitting in front of ERDDAP" authors = ["Alex Kerney "] [tool.poetry.dependencies] -python = "^3.9" +python = "^3.10" celery = "^5.2" django = "^4.1" django-cors-headers = "^3.13" @@ -26,8 +26,7 @@ vcrpy = "^4.2" whitenoise = "^6.2" xarray = "^2022.3.0" pandas = "^1.4.3" -prefect = "^1.2.3" -Django = "^4.1" +prefect = "^1.4.0" django-health-check = "^3.17.0" [tool.poetry.dev-dependencies] @@ -35,5 +34,5 @@ ipython = "^8.4" pyyaml = "^6.0" pytest = "^7.1" pytest-django = "^4.5" -pytest-cov = "^3.0" +pytest-cov = "^4.0" prospector = { version = "^1.7", extras = ["with_mypy", "with_vulture"] } From e12972aeed8c1ba77c22c72a823a40ef45aaddf0 Mon Sep 17 00:00:00 2001 From: Alex Kerney Date: Fri, 2 Dec 2022 15:20:59 -0500 Subject: [PATCH 2/2] Apply 3.10 typing updates --- app/forecasts/utils/erddap.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/forecasts/utils/erddap.py b/app/forecasts/utils/erddap.py index 5b992d4b..98c42dbb 100644 --- a/app/forecasts/utils/erddap.py +++ b/app/forecasts/utils/erddap.py @@ -1,11 +1,10 @@ """ERDDAP dataset interaction utility functions""" from datetime import datetime -from typing import Union from pandas import DataFrame -def attribute_value(info_df: DataFrame, attribute: str) -> Union[float, str, int]: +def attribute_value(info_df: DataFrame, attribute: str) -> float | str | int: """Return the value of a single dataset attribute""" row = info_df[info_df["Attribute Name"] == attribute].values[0] value = row[-1]