Skip to content

Update dependencies in pyproject.toml and setup.py#232

Open
stephen-huan wants to merge 3 commits intoOfflineIMAP:masterfrom
stephen-huan:urllib3
Open

Update dependencies in pyproject.toml and setup.py#232
stephen-huan wants to merge 3 commits intoOfflineIMAP:masterfrom
stephen-huan:urllib3

Conversation

@stephen-huan
Copy link

This PR

  • Move urllib3 from dependencies to testinternet

    • It appears urllib3 is only used in contrib/internet-urllib3.py, so put it with certifi in the testinternet optional-dependencies group.
  • Add PySocks optional-dependencies

    • PySocks is used for the optional proxy feature, so add it to optional-dependencies.
  • Change keyring[keyring] -> keyring in setup.py

    • For consistency with pyproject.toml and requirements-keyring.txt.
  • I've read the DCO.

  • I've read the Coding Guidelines

  • The relevant informations about the changes stands in the commit message, not here in the message of the pull request.

  • Code changes follow the style of the files they change.

  • Code is tested (provide details).

References

Additional information

@stephen-huan stephen-huan changed the title Urllib3 Update dependencies in pyproject.toml and setup.py Jan 28, 2026
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR reorganizes dependencies to better reflect their actual usage patterns. urllib3 is moved from core dependencies to the testinternet optional dependency group since it's only used in test/contrib code, and PySocks is added as a new optional dependency for proxy support.

Changes:

  • Moved urllib3 from main dependencies to testinternet optional dependencies
  • Added PySocks as a new optional dependency for proxy support
  • Changed keyring[keyring] to keyring in setup.py for consistency
  • Alphabetically sorted optional dependencies in both pyproject.toml and setup.py

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File Description
setup.py Removed urllib3 from install_requires, updated extras_require to add pysocks and move urllib3 to testinternet, changed keyring[keyring] to keyring, alphabetized extras
pyproject.toml Removed urllib3 from dependencies, added pysocks to optional-dependencies, moved urllib3 to testinternet optional-dependencies, alphabetized optional-dependencies
requirements-testinternet.txt Added urllib3~=1.25.9 to match the new testinternet optional dependency
requirements-pysocks.txt New file containing pysocks dependency for the new pysocks optional dependency

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

It appears urllib3 is only used in contrib/internet-urllib3.py, so put
it with certifi in the `testinternet` optional-dependencies group.

Signed-off-by: Stephen Huan <stephen.huan@cgdct.moe>
PySocks is used for the optional proxy feature.

Signed-off-by: Stephen Huan <stephen.huan@cgdct.moe>
For consistency with pyproject.toml and requirements-keyring.txt.

Signed-off-by: Stephen Huan <stephen.huan@cgdct.moe>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants