Merge pull request #695 from gamechanger/update-missing-deps

updating missing deps

.gitignore

@@ -1,6 +1,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+.mypy_cache/
 
 # C extensions
 *.so
@@ -43,6 +44,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+.venv
 
 # Translations
 *.mo

MANIFEST.in

@@ -0,0 +1,6 @@
+include *.rst *.txt
+recursive-exclude tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
+recursive-include docs *.rst conf.py Makefile make.bat

docs/contributing.md

@@ -53,6 +53,12 @@ Note that it will run as a foreground process which is useful to monitor daemon
 
 ## Running Tests
 
+Install test deps:
+
+```
+$ pip install -r requirements-dev.txt
+```
+
 Unit tests are pretty simple:
 
 ```

dusty/constants.py

@@ -4,7 +4,7 @@
 
 from pkg_resources import resource_string
 
-VERSION = '0.7.5'
+VERSION = '0.7.6-RC1'
 BINARY = False # overridden by PyInstaller when we build a binary
 PRERELEASE = False # overridden by PyInstaller when we build a prerelease binary
 

requirements-dev.txt

@@ -0,0 +1,4 @@
+-e .
+nose==1.3.7
+mock==1.0.1
+python-dateutil==2.8.

requirements.txt

@@ -0,0 +1,9 @@
+docker-py==1.7.2
+PyYAML==3.11
+PrettyTable==0.7.2
+github3.py==1.3.0
+GitPython==2.1.9
+docopt==0.6.2
+Schemer==0.2.9
+psutil==2.2.1
+Flask==0.10.1

setup.cfg

@@ -0,0 +1,2 @@
+[flake8]
+ignore=E501

setup.py

@@ -1,19 +1,22 @@
-### GAMECHANGER_CI_PREVENT_BUILD
-import os
+# ## GAMECHANGER_CI_PREVENT_BUILD
 import sys
-import imp
 from setuptools import find_packages
 
+
+def read(path):
+    with open(path, 'rb') as fid:
+        return fid.read().decode('utf-8')
+
+
 try:
     from restricted_pkg import setup
-except:
+except ImportError:
     # allow falling back to setuptools only if
     # we are not trying to upload
     if 'upload' in sys.argv:
         raise ImportError('restricted_pkg is required to upload, first do pip install restricted_pkg')
     from setuptools import setup
 
-requirements = imp.load_source('requirements', os.path.realpath('requirements.py'))
 
 setup(
     name='dusty',
@@ -22,11 +25,10 @@
     url='https://github.com/gamechanger/dusty',
     private_repository='gamechanger',
     author='GameChanger',
-    author_email='[email protected]',
     packages=find_packages(),
     package_data={'dusty': ['resources/*']},
-    install_requires=requirements.install_requires,
-    tests_require=requirements.test_requires,
+    install_requires=read('requirements.txt').splitlines(),
+    tests_require=read('requirements-dev.txt').splitlines()[1:],
     test_suite="nose.collector",
     entry_points={'console_scripts':
                   ['dusty = dusty.cli.__init__:main']},

tests/unit/compiler/compose/test.py

@@ -156,6 +156,7 @@ def test_composed_app(self, *args):
         expected_app_config = {
             'image': 'awesomeGCimage',
             'command': 'what command?',
+            'container_name': 'dusty_app1_1',
             'entrypoint': [],
             'links': [
                 'service1',

tests/unit/systems/nfs/client_test.py

@@ -10,5 +10,5 @@ def test_mount_args_string(self, fake_get_host_ip):
         fake_repo = Mock()
         fake_repo.local_path = '/repo/local/path'
         fake_repo.vm_path = '/persist/repos/remote/path'
-        expected_mount_args = '-t nfs -o async,udp,noatime 192.168.59.3:/repo/local/path /persist/repos/remote/path'
+        expected_mount_args = '-t nfs -o async,udp,noatime,nfsvers=3 192.168.59.3:/repo/local/path /persist/repos/remote/path'
         self.assertEqual(expected_mount_args, client._nfs_mount_args_string(fake_repo))