Skip to content

deps: upgrade & remove unnecessary dependencies #3014

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.

Sign up for GitHub

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

Merged
milas merged 1 commit into from
Jul 28, 2022
+16 −45
Merged

deps: upgrade & remove unnecessary dependencies #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ The latest stable version [is available on PyPI](https://pypi.python.org/pypi/do

pip install docker

If you are intending to connect to a docker host via TLS, add `docker[tls]` to your requirements instead, or install with pip:

pip install docker[tls]
> Older versions (< 6.0) required installing `docker[tls]` for SSL/TLS support.
Copy link
Copy Markdown
Contributor Author

@milas milas Jul 27, 2022

Choose a reason for hiding this comment

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

See #3013 - thinking we should release as v6.0.0 next 🙃

> This is no longer necessary and is a no-op, but is supported for backwards compatibility.

## Usage

Expand Down
13 changes: 0 additions & 13 deletions appveyor.yml
View file
Open in desktop

This file was deleted.

16 changes: 3 additions & 13 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
appdirs==1.4.3
asn1crypto==0.22.0
cffi==1.14.4
cryptography==3.4.7
enum34==1.1.6
idna==2.5
ipaddress==1.0.18
packaging==21.3
paramiko==2.10.1
pycparser==2.17
pyOpenSSL==18.0.0
pyparsing==2.2.0
paramiko==2.11.0
pywin32==304; sys_platform == 'win32'
requests==2.26.0
urllib3==1.26.5
requests==2.28.1
urllib3==1.26.11
websocket-client==0.56.0
19 changes: 7 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,23 @@
SOURCE_DIR = os.path.join(ROOT_DIR)

requirements = [
'packaging',
'packaging >= 14.0',
'requests >= 2.26.0',
'urllib3 >= 1.26.0',
'websocket-client >= 0.32.0',
'requests >= 2.14.2, != 2.18.0',
]

extras_require = {
# win32 APIs if on Windows (required for npipe support)
':sys_platform == "win32"': 'pywin32>=304',

# If using docker-py over TLS, highly recommend this option is
# pip-installed or pinned.

# TODO: if pip installing both "requests" and "requests[security]", the
# extra package from the "security" option are not installed (see
# https://github.com/pypa/pip/issues/4391). Once that's fixed, instead of
# installing the extra dependencies, install the following instead:
# 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'
'tls': ['pyOpenSSL>=17.5.0', 'cryptography>=3.4.7', 'idna>=2.0.0'],
# This is now a no-op, as similarly the requests[security] extra is
# a no-op as of requests 2.26.0, this is always available/by default now
# see https://github.com/psf/requests/pull/5867
'tls': [],

# Only required when connecting using the ssh:// protocol
'ssh': ['paramiko>=2.4.3'],

}

version = None
Expand Down
8 changes: 4 additions & 4 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
setuptools==58.2.0
coverage==6.0.1
setuptools==63.2.0
coverage==6.4.2
flake8==4.0.1
pytest==6.2.5
pytest==7.1.2
pytest-cov==3.0.0
pytest-timeout==2.0.1
pytest-timeout==2.1.0