diff --git a/hub/Chart.yaml b/hub/Chart.yaml index 50444a64a..20df2ce2c 100644 --- a/hub/Chart.yaml +++ b/hub/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: '1.0' description: Deployment Chart for JupyterHub name: hub -version: 20240731-224556.git.8057.h9643afd4 +version: 20240731-224556.git.8059.hf384f3d1 diff --git a/images/node-placeholder-scaler/requirements.in b/images/node-placeholder-scaler/requirements.in index f92f4c0d1..8218600d8 100644 --- a/images/node-placeholder-scaler/requirements.in +++ b/images/node-placeholder-scaler/requirements.in @@ -1,6 +1,6 @@ certifi==2024.07.04 DateTime ical==5.0.0 -requests +niquests==3.7.2 ruamel.yaml urllib3==2.2.2 diff --git a/images/node-placeholder-scaler/requirements.txt b/images/node-placeholder-scaler/requirements.txt index 51ad5c580..8c7e1a28b 100644 --- a/images/node-placeholder-scaler/requirements.txt +++ b/images/node-placeholder-scaler/requirements.txt @@ -7,31 +7,37 @@ annotated-types==0.7.0 # via pydantic certifi==2024.7.4 - # via - # -r requirements.in - # requests + # via -r requirements.in charset-normalizer==3.3.2 - # via requests + # via niquests datetime==5.5 # via -r requirements.in -emoji==2.12.1 +emoji==2.14.0 # via ical +h11==0.14.0 + # via urllib3-future ical==5.0.0 # via -r requirements.in -idna==3.7 - # via requests -pydantic==2.8.2 +idna==3.10 + # via niquests +jh2==5.0.3 + # via urllib3-future +kiss-headers==2.4.3 + # via niquests +niquests==3.7.2 + # via -r requirements.in +pydantic==2.9.2 # via ical -pydantic-core==2.20.1 +pydantic-core==2.23.4 # via pydantic -pyparsing==3.1.2 +pyparsing==3.1.4 # via ical python-dateutil==2.9.0.post0 # via ical -pytz==2024.1 +pytz==2024.2 # via datetime -requests==2.32.3 - # via -r requirements.in +qh3==1.2.0 + # via urllib3-future ruamel-yaml==0.18.6 # via -r requirements.in ruamel-yaml-clib==0.2.8 @@ -40,16 +46,17 @@ six==1.16.0 # via python-dateutil typing-extensions==4.12.2 # via - # emoji # pydantic # pydantic-core -tzdata==2024.1 +tzdata==2024.2 # via ical urllib3==2.2.2 - # via - # -r requirements.in - # requests -zope-interface==6.4.post2 + # via -r requirements.in +urllib3-future==2.10.901 + # via niquests +wassima==1.1.2 + # via niquests +zope-interface==7.0.3 # via datetime # The following packages are considered to be unsafe in a requirements file: diff --git a/images/node-placeholder-scaler/scaler/calendar.py b/images/node-placeholder-scaler/scaler/calendar.py index 73150cf6a..95ba45efa 100755 --- a/images/node-placeholder-scaler/scaler/calendar.py +++ b/images/node-placeholder-scaler/scaler/calendar.py @@ -2,7 +2,7 @@ import datetime import logging import re -import requests +import niquests as requests import zoneinfo from ical.calendar_stream import IcsCalendarStream diff --git a/images/node-placeholder-scaler/scaler/scaler.py b/images/node-placeholder-scaler/scaler/scaler.py index 7bb240d09..ea2e79af9 100755 --- a/images/node-placeholder-scaler/scaler/scaler.py +++ b/images/node-placeholder-scaler/scaler/scaler.py @@ -3,7 +3,7 @@ import argparse import tempfile import subprocess -import requests +import niquests as requests import os from copy import deepcopy import time diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml index 7753e9f66..51222e273 100644 --- a/node-placeholder/Chart.yaml +++ b/node-placeholder/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 20240731-224556.git.8054.h2abbc5d2 +version: 20240731-224556.git.8187.he9c6025c # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index 2c3932b5b..90226deaf 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -4,7 +4,7 @@ image: repository: us-central1-docker.pkg.dev/ucb-datahub-2018/core/node-placeholder-scaler pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "20240731-224556" + tag: "20240731-224556.git.8187.he9c6025c" imagePullSecrets: [] nameOverride: "" diff --git a/requirements.txt b/requirements.txt index 399167dc6..6f1b7c07b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ chartpress jupyter-repo2docker==2024.3.0 myst-parser chardet -requests==2.31.0 +niquests==3.7.2 urllib3<2.0.0 yamllint==1.35.1 diff --git a/scripts/post-grafana-annotation.py b/scripts/post-grafana-annotation.py index 9488638c2..bc161834c 100644 --- a/scripts/post-grafana-annotation.py +++ b/scripts/post-grafana-annotation.py @@ -13,7 +13,7 @@ - The requests library """ import argparse -import requests +import niquests as requests import os import time @@ -64,4 +64,4 @@ def main(): )) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/scripts/rsync-active-users.py b/scripts/rsync-active-users.py index 44fda9641..db4afb2a1 100755 --- a/scripts/rsync-active-users.py +++ b/scripts/rsync-active-users.py @@ -10,7 +10,7 @@ obtainable from {hub_url}/hub/token by an admin user. """ import os -import requests +import niquests as requests from dateutil.parser import parse from datetime import datetime, timedelta, timezone from concurrent.futures import ThreadPoolExecutor, as_completed