From ccb0be9b1581ccd687959849e3f7fd153c0ad17a Mon Sep 17 00:00:00 2001 From: "dboulware@ntia.doc.gov" Date: Tue, 15 Oct 2024 14:07:04 -0600 Subject: [PATCH 01/13] cal nan prevention branches. --- src/requirements-dev.txt | 4 ++-- src/requirements.in | 2 +- src/requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index f3f24e19..dc5c8218 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -309,11 +309,11 @@ scipy==1.10.1 # via # -r requirements.txt # scos-actions -scos-actions @ git+https://github.com/NTIA/scos-actions@10.0.2 +scos-actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention # via # -r requirements.txt # scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@7.0.1 +scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@cal_NAN_prevention # via -r requirements.txt sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via diff --git a/src/requirements.in b/src/requirements.in index 5a04eac5..aa29f3b1 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -10,7 +10,7 @@ jsonfield>=3.0, <4.0 packaging>=23.0, <24.0 psycopg2-binary>=2.0, <3.0 requests-mock>=1.0, <2.0 -scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@7.0.1 +scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@cal_NAN_prevention # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. diff --git a/src/requirements.txt b/src/requirements.txt index 943a2186..3163eb16 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -149,9 +149,9 @@ ruamel-yaml-clib==0.2.8 # via ruamel-yaml scipy==1.10.1 # via scos-actions -scos-actions @ git+https://github.com/NTIA/scos-actions@10.0.2 +scos-actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention # via scos-tekrsa -scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@7.0.1 +scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@cal_NAN_prevention # via -r requirements.in sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via scos-actions From 8d2ef0b972a56e2a2b4e4655a466f74117053f16 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:54:31 -0500 Subject: [PATCH 02/13] Remove default_language_version --- .pre-commit-config.yaml | 2 -- mkdocs.yml | 0 2 files changed, 2 deletions(-) delete mode 100644 mkdocs.yml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25afeb21..85f3450c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,4 @@ exclude: src/static/.+|.+\.pem|.+\.crt|.vscode/.+|LICENSE.md -default_language_version: - python: python3.10 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 diff --git a/mkdocs.yml b/mkdocs.yml deleted file mode 100644 index e69de29b..00000000 From e33b82b2db4dfa864140b5614f47785cc16b919d Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:55:55 -0500 Subject: [PATCH 03/13] Suppress docker build warnings --- docker/Dockerfile-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-api b/docker/Dockerfile-api index 9f946e27..7acbde08 100644 --- a/docker/Dockerfile-api +++ b/docker/Dockerfile-api @@ -9,7 +9,7 @@ RUN apt-get update -q && \ python3-pip python3.10 python3.10-dev usbutils && \ apt-get clean && rm -rf /var/lib/apt/lists/* -ENV PYTHONUNBUFFERED 1 +ENV PYTHONUNBUFFERED=1 RUN mkdir -p /src WORKDIR /src COPY ./src/requirements.txt /src From eff3abbe981e81049cc3db1c1ee55edc59b28df0 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:59:28 -0500 Subject: [PATCH 04/13] Update pre-commit hooks and drop Python 3.8 --- .github/workflows/github-actions-test.yml | 11 ++++++----- .pre-commit-config.yaml | 10 +++++----- src/requirements-dev.in | 6 +++--- src/requirements.in | 2 +- src/tox.ini | 5 +++-- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/github-actions-test.yml b/.github/workflows/github-actions-test.yml index 6aaa7561..807abdc7 100644 --- a/.github/workflows/github-actions-test.yml +++ b/.github/workflows/github-actions-test.yml @@ -19,18 +19,19 @@ jobs: fail-fast: false matrix: os: - - ubuntu-20.04 + - ubuntu-22.04 py: - - "3.8" - "3.9" - "3.10" + - "3.11" + - "3.12" steps: - name: Set up Python ${{ matrix.py }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.py }} - name: Checkout scos-sensor - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install tox-gh run: python -m pip install tox-gh - name: Set up test suite @@ -50,7 +51,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-20.04 + - ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 85f3450c..ea0ca05c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ exclude: src/static/.+|.+\.pem|.+\.crt|.vscode/.+|LICENSE.md repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-ast types: [file, python] @@ -17,10 +17,10 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 + rev: v3.19.0 hooks: - id: pyupgrade - args: ["--py38-plus"] + args: ["--py39-plus"] - repo: https://github.com/pycqa/isort rev: 5.13.2 hooks: @@ -29,12 +29,12 @@ repos: types: [file, python] args: ["--profile", "black", "--filter-files", "--gitignore"] - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black types: [file, python] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.41.0 + rev: v0.42.0 hooks: - id: markdownlint types: [file, markdown] diff --git a/src/requirements-dev.in b/src/requirements-dev.in index 8a58745a..28a9df4c 100644 --- a/src/requirements-dev.in +++ b/src/requirements-dev.in @@ -1,9 +1,9 @@ -rrequirements.txt -pre-commit>=3.0, <4.0 -pytest-cov>=3.0, <4.0 +pre-commit>=4.0, <5.0 +pytest-cov>=6.0, <7.0 pytest-django>=4.0, <5.0 -ray[default]>=2.5.0 +ray[default]>=2.10.0 tox>=4.0,<5.0 # The following are sub-dependencies for which SCOS Sensor enforces a diff --git a/src/requirements.in b/src/requirements.in index d1117c9f..0025dd80 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -12,7 +12,7 @@ psycopg2-binary>=2.0, <3.0 tzdata # https://code.djangoproject.com/ticket/33814 requests>=2.32.0 requests-mock>=1.0, <2.0 -scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@SEA-234_ubuntu22.04_python3.10 +scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@drop-python-3.8 # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. diff --git a/src/tox.ini b/src/tox.ini index d45b3322..649e8356 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -16,7 +16,7 @@ deps = commands = pytest {posargs} [testenv:cert] -envlist = py38,py39,py310,py311 +envlist = py39,py310,py311,py312 setenv = AUTHENTICATION=CERT CALLBACK_AUTHENTICATION=CERT @@ -43,6 +43,7 @@ omit = [gh] ; GitHub Actions CI with tox-gh python = - 3.8 = py38 3.9 = py39 3.10 = py310 + 3.11 = py311 + 3.12 = py312 From 7d44751bf42040e2365c8cdaf7e2e6909b6f4921 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:01:02 -0500 Subject: [PATCH 05/13] Run pre-commit hooks on all files --- src/initialization/action_loader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/initialization/action_loader.py b/src/initialization/action_loader.py index 6b06c966..9669e4ed 100644 --- a/src/initialization/action_loader.py +++ b/src/initialization/action_loader.py @@ -4,7 +4,6 @@ import os import pkgutil import shutil -from typing import Dict from django.conf import settings from scos_actions.actions import action_classes @@ -46,7 +45,7 @@ def __new__(cls): return cls._instance @property - def actions(self) -> Dict[str, Action]: + def actions(self) -> dict[str, Action]: """ Returns all sensor actions configured in the system. """ From 9dfff1990e75cf8380a2b950ce07d2e8dbf676f5 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:04:04 -0500 Subject: [PATCH 06/13] Upgrade nginx base image to 1.27 --- docker/Dockerfile-nginx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-nginx b/docker/Dockerfile-nginx index 6b7910d9..1da0fca7 100644 --- a/docker/Dockerfile-nginx +++ b/docker/Dockerfile-nginx @@ -1,4 +1,4 @@ -FROM nginx:1.24-alpine +FROM nginx:1.27-alpine RUN mkdir -p /var/www/scos-sensor/static COPY --chown=nginx:nginx ./src/static/ /var/www/scos-sensor/static/ From 23ab7a5bcad16fdc514b7206e46a9847ddd7ea06 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:01:20 -0500 Subject: [PATCH 07/13] update dependencies --- src/requirements-dev.in | 2 +- src/requirements.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requirements-dev.in b/src/requirements-dev.in index 28a9df4c..45e40a06 100644 --- a/src/requirements-dev.in +++ b/src/requirements-dev.in @@ -2,7 +2,7 @@ pre-commit>=4.0, <5.0 pytest-cov>=6.0, <7.0 -pytest-django>=4.0, <5.0 +pytest-django>=4.6, <5.0 ray[default]>=2.10.0 tox>=4.0,<5.0 diff --git a/src/requirements.in b/src/requirements.in index 0025dd80..d28d7fab 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -1,5 +1,5 @@ cryptography>=43.0.1 -django>=4.2, <5.0 +django>=4.2.8, <5.0 djangorestframework>=3.15.2, <4.0 django-session-timeout>=0.1, <1.0 drf-yasg>=1.0, <2.0 From 62d4e438cd1d431a39f66c604c80b560b2d869ad Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Wed, 13 Nov 2024 21:35:39 +0000 Subject: [PATCH 08/13] Recompile requirements --- src/requirements-dev.txt | 134 +++++++++++++++++++-------------------- src/requirements.txt | 4 +- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index be9fe2e7..903a122a 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -6,32 +6,32 @@ # aiohappyeyeballs==2.3.6 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp aiohttp==3.10.3 # via + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # -r requirements-dev.in - # -r requirements.txt # aiohttp-cors # ray aiohttp-cors==0.7.0 # via ray aiosignal==1.3.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp # ray asgiref==3.7.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # django async-timeout==4.0.3 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp attrs==23.1.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp # jsonschema # referencing @@ -41,11 +41,11 @@ cachetools==5.3.2 # tox certifi==2024.7.4 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # requests cffi==1.16.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # cryptography cfgv==3.4.0 # via pre-commit @@ -53,58 +53,58 @@ chardet==5.2.0 # via tox charset-normalizer==3.3.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # requests click==8.1.7 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ray colorama==0.4.6 # via tox colorful==0.5.5 # via ray -coverage[toml]==7.3.2 +coverage[toml]==7.6.4 # via pytest-cov cryptography==43.0.1 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt defusedxml==0.7.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # its-preselector distlib==0.3.7 # via virtualenv django==4.2.15 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # django-session-timeout # djangorestframework # drf-yasg # jsonfield # scos-actions django-session-timeout==0.1.0 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt djangorestframework==3.15.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg drf-yasg==1.21.7 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt environs==9.5.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions # scos-tekrsa exceptiongroup==1.2.0 # via pytest filelock==3.13.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ray # tox # virtualenv frozenlist==1.4.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp # aiosignal # ray @@ -116,38 +116,38 @@ googleapis-common-protos==1.61.0 # via google-api-core grpcio==1.59.3 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ray gunicorn==22.0.0 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt identify==2.5.32 # via pre-commit idna==3.7 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # requests # yarl inflection==0.5.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg iniconfig==2.0.0 # via pytest its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions jinja2==3.1.4 # via memray jsonfield==3.1.0 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt jsonschema==4.20.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ray jsonschema-specifications==2023.11.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # jsonschema linkify-it-py==2.0.3 # via markdown-it-py @@ -160,7 +160,7 @@ markupsafe==2.1.5 # via jinja2 marshmallow==3.20.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # environs mdit-py-plugins==0.4.2 # via markdown-it-py @@ -170,26 +170,26 @@ memray==1.14.0 # via ray msgpack==1.0.7 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ray msgspec==0.18.4 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions multidict==6.0.5 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp # yarl nodeenv==1.8.0 # via pre-commit numexpr==2.8.6 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions -numpy==1.24.4 +numpy==2.1.3 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # numexpr # scipy # scos-actions @@ -201,7 +201,7 @@ opencensus-context==0.1.3 # via opencensus packaging==23.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg # gunicorn # marshmallow @@ -218,22 +218,22 @@ pluggy==1.3.0 # via # pytest # tox -pre-commit==3.5.0 +pre-commit==4.0.1 # via -r requirements-dev.in prometheus-client==0.19.0 # via ray protobuf==4.25.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # google-api-core # googleapis-common-protos # ray psutil==5.9.6 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions psycopg2-binary==2.9.9 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt py-spy==0.3.14 # via ray pyasn1==0.5.1 @@ -244,7 +244,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # cffi pydantic==1.10.13 # via ray @@ -256,83 +256,83 @@ pytest==7.4.3 # via # pytest-cov # pytest-django -pytest-cov==3.0.0 +pytest-cov==6.0.0 # via -r requirements-dev.in pytest-django==4.7.0 # via -r requirements-dev.in python-dateutil==2.8.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions python-dotenv==1.0.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # environs pytz==2023.3.post1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg pyyaml==6.0.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg # pre-commit # ray ray[default]==2.37.0 # via + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # -r requirements-dev.in - # -r requirements.txt # scos-actions referencing==0.31.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # jsonschema # jsonschema-specifications requests==2.32.3 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # google-api-core # its-preselector # ray # requests-mock requests-mock==1.11.0 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt rich==13.8.1 # via # memray # textual rpds-py==0.13.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # jsonschema # referencing rsa==4.9 # via google-auth ruamel-yaml==0.18.5 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions ruamel-yaml-clib==0.2.8 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # ruamel-yaml -scipy==1.10.1 +scipy==1.14.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions scos-actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-tekrsa scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@cal_NAN_prevention - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions six==1.16.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # django-session-timeout # python-dateutil # requests-mock @@ -341,11 +341,11 @@ smart-open==6.4.0 # via ray sqlparse==0.5.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # django tekrsa-api-wrap==1.3.3 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-tekrsa textual==0.81.0 # via memray @@ -359,21 +359,21 @@ tox==4.5.1.1 # via -r requirements-dev.in typing-extensions==4.8.0 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # asgiref # pydantic # textual tzdata==2024.1 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt uc-micro-py==1.0.3 # via linkify-it-py uritemplate==4.1.1 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # drf-yasg urllib3==2.2.2 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # requests virtualenv==20.21.0 # via @@ -382,10 +382,10 @@ virtualenv==20.21.0 # tox yarl==1.9.4 # via - # -r requirements.txt + # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # aiohttp zipp==3.19.1 - # via -r requirements.txt + # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/src/requirements.txt b/src/requirements.txt index 5a6fc42a..cef05a5b 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -96,7 +96,7 @@ multidict==6.0.5 # yarl numexpr==2.8.6 # via scos-actions -numpy==1.24.4 +numpy==2.1.3 # via # numexpr # scipy @@ -151,7 +151,7 @@ ruamel-yaml==0.18.5 # via scos-actions ruamel-yaml-clib==0.2.8 # via ruamel-yaml -scipy==1.10.1 +scipy==1.14.1 # via scos-actions scos-actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention # via scos-tekrsa From 8f128105b88740fb5e80c366e8a974cabe30d3f9 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Wed, 13 Nov 2024 22:01:54 +0000 Subject: [PATCH 09/13] Recompile requirements after scos-actions pins numpy to lower version --- src/requirements-dev.txt | 2 +- src/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 903a122a..35e9ba53 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -187,7 +187,7 @@ numexpr==2.8.6 # via # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # scos-actions -numpy==2.1.3 +numpy==1.26.4 # via # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # numexpr diff --git a/src/requirements.txt b/src/requirements.txt index cef05a5b..f72d5a17 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -96,7 +96,7 @@ multidict==6.0.5 # yarl numexpr==2.8.6 # via scos-actions -numpy==2.1.3 +numpy==1.26.4 # via # numexpr # scipy From bd388b5947f97e62812cebd67fd90ae7edb0db1d Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Mon, 18 Nov 2024 10:17:45 -0700 Subject: [PATCH 10/13] require django>=4.2.16 --- src/requirements-dev.txt | 124 +++++++++++++++++++-------------------- src/requirements.in | 2 +- src/requirements.txt | 2 +- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index a076c9d0..49f27a6b 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -6,32 +6,32 @@ # aiohappyeyeballs==2.4.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp aiohttp==3.10.3 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # -r requirements-dev.in + # -r requirements.txt # aiohttp-cors # ray aiohttp-cors==0.7.0 # via ray aiosignal==1.3.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp # ray asgiref==3.7.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # django async-timeout==4.0.3 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp attrs==23.1.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp # jsonschema # referencing @@ -41,11 +41,11 @@ cachetools==5.3.2 # tox certifi==2024.7.4 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # requests cffi==1.16.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # cryptography cfgv==3.4.0 # via pre-commit @@ -53,11 +53,11 @@ chardet==5.2.0 # via tox charset-normalizer==3.3.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # requests click==8.1.7 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ray colorama==0.4.6 # via tox @@ -66,45 +66,45 @@ colorful==0.5.5 coverage[toml]==7.6.4 # via pytest-cov cryptography==43.0.1 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt defusedxml==0.7.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # its-preselector distlib==0.3.7 # via virtualenv -django==4.2.15 +django==4.2.16 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # django-session-timeout # djangorestframework # drf-yasg # jsonfield # scos-actions django-session-timeout==0.1.0 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt djangorestframework==3.15.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg drf-yasg==1.21.7 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt environs==9.5.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions # scos-tekrsa exceptiongroup==1.2.0 # via pytest filelock==3.13.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ray # tox # virtualenv frozenlist==1.4.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp # aiosignal # ray @@ -116,38 +116,38 @@ googleapis-common-protos==1.61.0 # via google-api-core grpcio==1.59.3 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ray gunicorn==22.0.0 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt identify==2.5.32 # via pre-commit idna==3.7 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # requests # yarl inflection==0.5.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg iniconfig==2.0.0 # via pytest its-preselector @ git+https://github.com/NTIA/Preselector@3.1.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions jinja2==3.1.4 # via memray jsonfield==3.1.0 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt jsonschema==4.20.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ray jsonschema-specifications==2023.11.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # jsonschema linkify-it-py==2.0.3 # via markdown-it-py @@ -160,7 +160,7 @@ markupsafe==2.1.5 # via jinja2 marshmallow==3.20.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # environs mdit-py-plugins==0.4.2 # via markdown-it-py @@ -170,26 +170,26 @@ memray==1.14.0 # via ray msgpack==1.0.7 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ray msgspec==0.18.4 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions multidict==6.0.5 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp # yarl nodeenv==1.8.0 # via pre-commit numexpr==2.10.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions numpy==1.26.4 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # numexpr # scipy # scos-actions @@ -201,7 +201,7 @@ opencensus-context==0.1.3 # via opencensus packaging==23.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg # gunicorn # marshmallow @@ -224,16 +224,16 @@ prometheus-client==0.19.0 # via ray protobuf==4.25.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # google-api-core # googleapis-common-protos # ray psutil==5.9.6 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions psycopg2-binary==2.9.9 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt py-spy==0.3.14 # via ray pyasn1==0.5.1 @@ -244,7 +244,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # cffi pydantic==1.10.13 # via ray @@ -262,77 +262,77 @@ pytest-django==4.7.0 # via -r requirements-dev.in python-dateutil==2.8.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions python-dotenv==1.0.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # environs pytz==2023.3.post1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg pyyaml==6.0.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg # pre-commit # ray ray[default]==2.37.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt # -r requirements-dev.in + # -r requirements.txt # scos-actions referencing==0.31.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # jsonschema # jsonschema-specifications requests==2.32.3 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # google-api-core # its-preselector # ray # requests-mock requests-mock==1.11.0 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt rich==13.8.1 # via # memray # textual rpds-py==0.13.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # jsonschema # referencing rsa==4.9 # via google-auth ruamel-yaml==0.18.5 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions ruamel-yaml-clib==0.2.8 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # ruamel-yaml scipy==1.13.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions scos-actions @ git+https://github.com/NTIA/scos-actions@11.0.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-tekrsa scos-tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 # via -r requirements.txt sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-actions six==1.16.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # django-session-timeout # python-dateutil # requests-mock @@ -341,11 +341,11 @@ smart-open==6.4.0 # via ray sqlparse==0.5.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # django tekrsa-api-wrap==1.3.3 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # scos-tekrsa textual==0.81.0 # via memray @@ -359,21 +359,21 @@ tox==4.5.1.1 # via -r requirements-dev.in typing-extensions==4.8.0 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # asgiref # pydantic # textual tzdata==2024.1 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt uc-micro-py==1.0.3 # via linkify-it-py uritemplate==4.1.1 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # drf-yasg urllib3==2.2.2 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # requests virtualenv==20.21.0 # via @@ -382,10 +382,10 @@ virtualenv==20.21.0 # tox yarl==1.9.4 # via - # -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # -r requirements.txt # aiohttp zipp==3.19.1 - # via -r /home/deploy/temp-anthony/scos-sensor/src/requirements.txt + # via -r requirements.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/src/requirements.in b/src/requirements.in index d2cbfcb5..0287fb01 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -1,5 +1,5 @@ cryptography>=43.0.1 -django>=4.2.8, <5.0 +django>=4.2.16, <5.0 djangorestframework>=3.15.2, <4.0 django-session-timeout>=0.1, <1.0 drf-yasg>=1.0, <2.0 diff --git a/src/requirements.txt b/src/requirements.txt index 7e973198..4f278e4c 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -35,7 +35,7 @@ cryptography==43.0.1 # via -r requirements.in defusedxml==0.7.1 # via its-preselector -django==4.2.15 +django==4.2.16 # via # -r requirements.in # django-session-timeout From 36d95bb6009aec64e6d03a1e1287c7d18f844e21 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:15:00 -0500 Subject: [PATCH 11/13] Use stable NGINX 1.26 --- docker/Dockerfile-nginx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-nginx b/docker/Dockerfile-nginx index 1da0fca7..cad1ea51 100644 --- a/docker/Dockerfile-nginx +++ b/docker/Dockerfile-nginx @@ -1,4 +1,4 @@ -FROM nginx:1.27-alpine +FROM nginx:1.26-alpine RUN mkdir -p /var/www/scos-sensor/static COPY --chown=nginx:nginx ./src/static/ /var/www/scos-sensor/static/ From 8c1422d49094d9b4ea866abd7cd4628c27ff609c Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:06:46 -0500 Subject: [PATCH 12/13] require aiohttp>=3.10.11 --- src/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.in b/src/requirements.in index 0287fb01..e4a4f7db 100644 --- a/src/requirements.in +++ b/src/requirements.in @@ -17,7 +17,7 @@ scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 # The following are sub-dependencies for which SCOS Sensor enforces a # higher minimum patch version than the dependencies which require them. # This is done to ensure the inclusion of specific security patches. -aiohttp>=3.10.2 # CVE-2024-42367 +aiohttp>=3.10.11 # CVE-2024-52304 certifi>=2024.7.4 # CVE-2024-39689 idna>=3.7 # CVE-2024-3651 grpcio>=1.53.0 # CVE-2023-32732, CVE-2023-32731, CVE-2023-1428 From 5f1fb0fa33f3292eaf52c8ee9b7ed61f02d8055b Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:15:15 -0500 Subject: [PATCH 13/13] recompile dependencies --- src/requirements-dev.txt | 9 +++++++-- src/requirements.txt | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/requirements-dev.txt b/src/requirements-dev.txt index 49f27a6b..12add771 100644 --- a/src/requirements-dev.txt +++ b/src/requirements-dev.txt @@ -8,7 +8,7 @@ aiohappyeyeballs==2.4.0 # via # -r requirements.txt # aiohttp -aiohttp==3.10.3 +aiohttp==3.11.5 # via # -r requirements-dev.in # -r requirements.txt @@ -222,6 +222,11 @@ pre-commit==4.0.1 # via -r requirements-dev.in prometheus-client==0.19.0 # via ray +propcache==0.2.0 + # via + # -r requirements.txt + # aiohttp + # yarl protobuf==4.25.1 # via # -r requirements.txt @@ -380,7 +385,7 @@ virtualenv==20.21.0 # pre-commit # ray # tox -yarl==1.9.4 +yarl==1.17.2 # via # -r requirements.txt # aiohttp diff --git a/src/requirements.txt b/src/requirements.txt index 4f278e4c..80b9740f 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -6,7 +6,7 @@ # aiohappyeyeballs==2.4.0 # via aiohttp -aiohttp==3.10.3 +aiohttp==3.11.5 # via -r requirements.in aiosignal==1.3.1 # via @@ -110,6 +110,10 @@ packaging==23.2 # gunicorn # marshmallow # ray +propcache==0.2.0 + # via + # aiohttp + # yarl protobuf==4.25.1 # via ray psutil==5.9.6 @@ -181,7 +185,7 @@ urllib3==2.2.2 # via # -r requirements.in # requests -yarl==1.9.4 +yarl==1.17.2 # via aiohttp zipp==3.19.1 # via -r requirements.in