Kaydet (Commit) 5daf7bcc authored tarafından shin-'s avatar shin-

Added .gitignore, proper packaging, updated setup.py, cleaned up commented code

üst 76e846d4
build
dist
*.egg-info
*.pyc
from client import Client
\ No newline at end of file
...@@ -14,12 +14,11 @@ class Client(requests.Session): ...@@ -14,12 +14,11 @@ class Client(requests.Session):
return self.base_url + path return self.base_url + path
def _result(self, response, json=False): def _result(self, response, json=False):
# FIXME
if response.status_code != 200: if response.status_code != 200:
response.raise_for_status() response.raise_for_status()
if json: if json:
return response.json() return response.json()
return response return response.text
def _container_config(self, image, command, hostname=None, user=None, detach=False, def _container_config(self, image, command, hostname=None, user=None, detach=False,
stdin_open=False, tty=False, mem_limit=0, ports=None, environment=None, dns=None, stdin_open=False, tty=False, mem_limit=0, ports=None, environment=None, dns=None,
...@@ -401,14 +400,6 @@ class BuilderClient(object): ...@@ -401,14 +400,6 @@ class BuilderClient(object):
self.config['Cmd'] = None self.config['Cmd'] = None
self.merge_config(self.config, config) self.merge_config(self.config, config)
# res = self.client.post(self.client._url('/images/getCache'), {
# 'Id': self.image,
# 'Config': config
# })
# if res.status_code != 200 and res.status_code != 404:
# res.raise_for_status()
# elif res.status_code != 404:
# self.image = res.json().get('Id', self.image)
container = self.run() container = self.run()
self.config['Cmd'] = cmd self.config['Cmd'] = cmd
......
#/usr/bin/env python #/usr/bin/env python
import os import os
from setuptools import setup, find_packages from setuptools import setup
ROOT_DIR = os.path.dirname(__file__) ROOT_DIR = os.path.dirname(__file__)
SOURCE_DIR = os.path.join(ROOT_DIR) SOURCE_DIR = os.path.join(ROOT_DIR)
...@@ -8,10 +8,10 @@ SOURCE_DIR = os.path.join(ROOT_DIR) ...@@ -8,10 +8,10 @@ SOURCE_DIR = os.path.join(ROOT_DIR)
test_requirements = [] test_requirements = []
setup( setup(
name="docker-py", name="docker-py",
version='0.0.1', version='0.0.2',
description="Python client for Docker.", description="Python client for Docker.",
packages=find_packages(), packages=['docker'],
install_requires=[] + test_requirements, install_requires=['requests'] + test_requirements,
zip_safe=False, zip_safe=False,
classifiers=['Development Status :: 3 - Alpha', classifiers=['Development Status :: 3 - Alpha',
'Environment :: Other Environment', 'Environment :: Other Environment',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment