Fixed deis#41 -- repackaged client as a single-file install.

Author: mboersma

.travis.yml

@@ -18,8 +18,10 @@ before_install:
   - sudo apt-get install -qq libevent-dev libpq-dev
 
 install:
-  - "pip install -r requirements.txt --use-mirrors"
-  - "pip install coveralls sphinx --use-mirrors"
+  - pip install -r requirements.txt --use-mirrors
+  - pip install -r client/requirements.txt --use-mirrors
+  - pip install -r docs/requirements.txt --use-mirrors
+  - pip install coveralls flake8 --use-mirrors
 
 before_script:
   - "psql -c 'create database deis_testing;' -U postgres"
@@ -39,8 +41,9 @@ before_script:
     EOF
 
 script:
-  - coverage run manage.py test api celerytasks client web
-  - make -C docs clean dirhtml
+  # - make flake8
+  - make coverage
+  - make -C docs
 
 after_success:
   - coveralls

client/.gitignore

@@ -1,7 +1,7 @@
 
 # Install deis client locally through pip.
 install:
-	pip install deis
+	pip install . 
 
 # Remove the installed copy of the deis client through pip.
 uninstall:

client/Makefile

@@ -0,0 +1,3 @@
+"""
+A command-line client for the Deis system.
+"""

client/__init__.py

@@ -40,17 +40,17 @@
 
 from cookielib import MozillaCookieJar
 from getpass import getpass
+import glob
 import json
 import os.path
-import glob
 import re
+import subprocess
 import sys
 import urlparse
 
 from docopt import docopt
 from docopt import DocoptExit
 import requests
-import subprocess
 import yaml
 
 

client/deis/client.py client/deis.pyclient/deis/client.py renamed to client/deis.py

@@ -3,7 +3,6 @@
 """Install the Deis command-line client."""
 
 
-import os.path
 try:
     from setuptools import setup
     USE_SETUPTOOLS = True
@@ -25,10 +24,10 @@
 if USE_SETUPTOOLS:
     KWARGS = {
         'install_requires': ['docopt', 'PyYAML', 'requests'],
-        'entry_points': {'console_scripts': ['deis = deis.client:main']},
+        'entry_points': {'console_scripts': ['deis = deis:main']},
     }
 else:
-    KWARGS = {'scripts': [os.path.sep.join(['deis', 'deis'])]}
+    KWARGS = {'scripts': ['deis']}
 
 
 # pylint: disable=W0142
@@ -52,12 +51,11 @@
           'Programming Language :: Python :: 2.7',
           'Topic :: Internet',
           'Topic :: System :: Systems Administration',
-          ],
-      packages=['deis'],
+      ],
+      py_modules=['deis'],
       data_files=[
           ('.', ['README.rst']),
-          ],
-      scripts=['deis/deis'],
+      ],
       long_description=LONG_DESCRIPTION,
       requires=['docopt', 'PyYAML', 'requests'],
       zip_safe=True,