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

Switch to httpx #212

Merged
merged 2 commits into from
May 17, 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
26 changes: 26 additions & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,32 @@ Release notes
Stability, Maintainability, and Testing
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

vversion
--------

Security
~~~~~~~~

Features
~~~~~~~~

Breaking changes
~~~~~~~~~~~~~~~~

Bugfixes
~~~~~~~~

Documentation
~~~~~~~~~~~~~

Deprecations
~~~~~~~~~~~~

Stability, Maintainability, and Testing
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

* Replaced networking dependency ``requests`` with ``httpx``.

v24.04.0
--------

Expand Down
14 changes: 9 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ classifiers = [
]
requires-python = ">=3.10"
dependencies = [
"email-validator",
"email-validator >= 2",
"httpx >= 0.24",
"pydantic >= 2",
"python-dateutil",
"requests >= 2.31",
"python-dateutil >= 2.8",
]
dynamic = ["version"]

Expand All @@ -41,8 +41,12 @@ dynamic = ["version"]
"Source" = "https://github.com/SciCatProject/scitacean"

[project.optional-dependencies]
sftp = ["paramiko"]
test = ["filelock", "hypothesis", "pyyaml"]
sftp = ["paramiko >= 3"]
test = [
"filelock >= 3",
"hypothesis >= 6.48",
"pyyaml >= 5"
]

[tool.setuptools_scm]

Expand Down
9 changes: 4 additions & 5 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
email-validator
fabric
paramiko
email-validator >= 2
httpx >= 0.24
paramiko >= 3
pydantic >= 2
python-dateutil
requests
python-dateutil >= 2.8
39 changes: 18 additions & 21 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:6b8a253be2c23e3bf131e90c6b06c34bf612344f
# SHA1:3e3a0c875b5da89f27065e036b85c7bcbf0d1700
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -7,38 +7,37 @@
#
annotated-types==0.6.0
# via pydantic
anyio==4.3.0
# via httpx
bcrypt==4.1.3
# via paramiko
certifi==2024.2.2
# via requests
# via
# httpcore
# httpx
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.2
# via requests
cryptography==42.0.7
# via paramiko
decorator==5.1.1
# via fabric
deprecated==1.2.14
# via fabric
dnspython==2.6.1
# via email-validator
email-validator==2.1.1
# via -r base.in
fabric==3.2.2
h11==0.14.0
# via httpcore
httpcore==1.0.5
# via httpx
httpx==0.27.0
# via -r base.in
idna==3.7
# via
# anyio
# email-validator
# requests
invoke==2.2.0
# via fabric
# httpx
paramiko==3.4.0
# via
# -r base.in
# fabric
# via -r base.in
pycparser==2.22
# via cffi
pydantic==2.7.1
Expand All @@ -49,15 +48,13 @@ pynacl==1.5.0
# via paramiko
python-dateutil==2.9.0.post0
# via -r base.in
requests==2.31.0
# via -r base.in
six==1.16.0
# via python-dateutil
sniffio==1.3.1
# via
# anyio
# httpx
typing-extensions==4.11.0
# via
# pydantic
# pydantic-core
urllib3==2.2.1
# via requests
wrapt==1.16.0
# via deprecated
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ packaging==24.0
# via
# pyproject-api
# tox
platformdirs==4.2.1
platformdirs==4.2.2
# via
# tox
# virtualenv
Expand All @@ -31,5 +31,5 @@ pyproject-api==1.6.1
# via tox
tox==4.15.0
# via -r ci.in
virtualenv==20.26.1
virtualenv==20.26.2
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ jinja2
jupyterlab
pip-compile-multi
pre-commit
pyyaml
ruff
18 changes: 2 additions & 16 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:769a2bd5b2bd098ca3a15ab6c50d67b6f30f0af4
# SHA1:f8f8b250cced1edd7282d46fd442979050ea8c1a
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -12,10 +12,6 @@
-r static.txt
-r test.txt
-r wheels.txt
anyio==4.3.0
# via
# httpx
# jupyter-server
argon2-cffi==23.1.0
# via jupyter-server
argon2-cffi-bindings==21.2.0
Expand All @@ -30,12 +26,6 @@ click==8.1.7
# pip-tools
fqdn==1.5.1
# via jsonschema
h11==0.14.0
# via httpcore
httpcore==1.0.5
# via httpx
httpx==0.27.0
# via jupyterlab
isoduration==20.11.0
# via jsonschema
json5==0.9.25
Expand Down Expand Up @@ -83,14 +73,10 @@ rfc3986-validator==0.1.1
# via
# jsonschema
# jupyter-events
ruff==0.4.3
ruff==0.4.4
# via -r dev.in
send2trash==1.8.3
# via jupyter-server
sniffio==1.3.1
# via
# anyio
# httpx
terminado==0.18.1
# via
# jupyter-server
Expand Down
14 changes: 11 additions & 3 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
-r base.txt
-r test.txt
accessible-pygments==0.0.4
accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==0.7.16
# via sphinx
Expand All @@ -25,10 +25,14 @@ beautifulsoup4==4.12.3
# pydata-sphinx-theme
bleach==6.1.0
# via nbconvert
charset-normalizer==3.3.2
# via requests
comm==0.2.2
# via ipykernel
debugpy==1.8.1
# via ipykernel
decorator==5.1.1
# via ipython
defusedxml==0.7.1
# via nbconvert
docutils==0.21.2
Expand Down Expand Up @@ -86,7 +90,7 @@ matplotlib-inline==0.1.7
# via
# ipykernel
# ipython
mdit-py-plugins==0.4.0
mdit-py-plugins==0.4.1
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
Expand All @@ -113,7 +117,7 @@ parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.2.1
platformdirs==4.2.2
# via jupyter-core
prompt-toolkit==3.0.43
# via ipython
Expand Down Expand Up @@ -144,6 +148,8 @@ referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
# via sphinx
rpds-py==0.18.1
# via
# jsonschema
Expand Down Expand Up @@ -200,6 +206,8 @@ traitlets==5.14.3
# nbconvert
# nbformat
# nbsphinx
urllib3==2.2.1
# via requests
wcwidth==0.2.13
# via prompt-toolkit
webencodings==0.5.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/mypy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ types-pyyaml==6.0.12.20240311
# via -r mypy.in
types-requests==2.31.0.20240406
# via -r mypy.in
urllib3==2.2.1
# via types-requests
6 changes: 3 additions & 3 deletions requirements/static.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ identify==2.5.36
# via pre-commit
nodeenv==1.8.0
# via pre-commit
platformdirs==4.2.1
platformdirs==4.2.2
# via virtualenv
pre-commit==3.7.0
pre-commit==3.7.1
# via -r static.in
pyyaml==6.0.1
# via pre-commit
virtualenv==20.26.1
virtualenv==20.26.2
# via pre-commit

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/test.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-r base.in
filelock[typing]
hypothesis
pyfakefs
pytest
pytest-randomly
pytest-socket
pytest-xdist
pyyaml
filelock[typing] >= 3
hypothesis >= 6.48
pyfakefs >= 5
pytest >= 7
pytest-randomly >= 3
pytest-socket >= 0.7
pytest-xdist >= 3
pyyaml >= 5
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:75deeef1826d3fede48f6f2de96ad90ac30e27a5
# SHA1:6249614025d02c5c95194d10c86593010e5fbf04
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -12,15 +12,15 @@ execnet==2.1.1
# via pytest-xdist
filelock[typing]==3.14.0
# via -r test.in
hypothesis==6.100.5
hypothesis==6.102.4
# via -r test.in
iniconfig==2.0.0
# via pytest
packaging==24.0
# via pytest
pluggy==1.5.0
# via pytest
pyfakefs==5.4.1
pyfakefs==5.5.0
# via -r test.in
pytest==8.2.0
# via
Expand Down
Loading
Loading