Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

porting things to niquests #6023

Merged
merged 6 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion images/node-placeholder-scaler/requirements.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
certifi==2024.07.04
DateTime
ical==5.0.0
requests
niquests==3.7.2
ruamel.yaml
urllib3==2.2.2
45 changes: 26 additions & 19 deletions images/node-placeholder-scaler/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion images/node-placeholder-scaler/scaler/calendar.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import datetime
import logging
import re
import requests
import niquests as requests
import zoneinfo

from ical.calendar_stream import IcsCalendarStream
Expand Down
2 changes: 1 addition & 1 deletion images/node-placeholder-scaler/scaler/scaler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import argparse
import tempfile
import subprocess
import requests
import niquests as requests
import os
from copy import deepcopy
import time
Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions scripts/post-grafana-annotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- The requests library
"""
import argparse
import requests
import niquests as requests
import os
import time

Expand Down Expand Up @@ -64,4 +64,4 @@ def main():
))

if __name__ == '__main__':
main()
main()
2 changes: 1 addition & 1 deletion scripts/rsync-active-users.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading