summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2016-11-28 11:29:42 -0800
committerGitHub <noreply@github.com>2016-11-28 11:29:42 -0800
commitf36c28926cf9d0e3bfe0f2275c084d63cd3c6169 (patch)
treefdfa1dc49188fe466ebe88f364d6ba27b9faad02
parent3518c9f631de1984db95c864b25e499ba623019c (diff)
parentfc9f7e2b2feea99a52b75077046473e7ce15ea82 (diff)
downloaddocker-py-f36c28926cf9d0e3bfe0f2275c084d63cd3c6169.tar.gz
Merge pull request #1305 from bfirsh/update-setup-py
Update setup.py and things
-rw-r--r--README.md2
-rw-r--r--docker/version.py2
-rw-r--r--setup.py15
3 files changed, 8 insertions, 11 deletions
diff --git a/README.md b/README.md
index ab54d52..11fcbad 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
**Warning:** This readme is for the development version of docker-py, which is significantly different to the stable version. [Documentation for the stable version is here.](https://docker-py.readthedocs.io/)
-A Python library for the Docker API. It lets you do anything the `docker` command does, but from within Python apps – run containers, manage containers, manage Swarms, etc.
+A Python library for the Docker Engine API. It lets you do anything the `docker` command does, but from within Python apps – run containers, manage containers, manage Swarms, etc.
## Installation
diff --git a/docker/version.py b/docker/version.py
index 3bbd804..ab6838f 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.11.0-dev"
+version = "2.0.0-dev"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/setup.py b/setup.py
index 89c97c8..edf4b0e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
import os
import sys
-from setuptools import setup
+from setuptools import setup, find_packages
ROOT_DIR = os.path.dirname(__file__)
@@ -43,22 +43,19 @@ except IOError:
pass
setup(
- name="docker-py",
+ name="docker",
version=version,
- description="Python client for Docker.",
+ description="A Python library for the Docker Engine API.",
long_description=long_description,
- url='https://github.com/docker/docker-py/',
- packages=[
- 'docker', 'docker.api', 'docker.transport', 'docker.utils',
- 'docker.types',
- ],
+ url='https://github.com/docker/docker-py',
+ packages=find_packages(exclude=["tests.*", "tests"]),
install_requires=requirements,
tests_require=test_requirements,
extras_require=extras_require,
zip_safe=False,
test_suite='tests',
classifiers=[
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 5 - Production/Stable',
'Environment :: Other Environment',
'Intended Audience :: Developers',
'Operating System :: OS Independent',