Merge pull request #16 from mogproject/topic-mog-commons-#15

refactor using mog-commons closes #15
mogproject · Nov 10, 2015 · a6d78a7 · a6d78a7
2 parents dc6bd3d + bd98e2c
commit a6d78a7
Show file tree

Hide file tree

Showing 34 changed files with 3,237 additions and 356 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,4 @@ target/
 # Test resources
 !/tests/resources/*
 
+.python-version
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 
 cache: pip
 
@@ -17,7 +18,7 @@ install:
   - pip install coveralls
 
 script:
-  - coverage run --source=src setup.py test
+  - coverage run --source=src --omit='src/backported/*' setup.py test
 
 after_success:
   - coveralls

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ dev-uninstall:
 	$(PYTHON) setup.py develop -u
 
 pep8:
-	pep8 --max-line-length 120 --ignore E402,E731 src tests
+	pep8 --max-line-length 120 --ignore E402,E731 src/$(PROG) tests
 
 test: pep8
 	$(PYTHON) setup.py test

diff --git a/setup.py b/setup.py
@@ -1,11 +1,17 @@
+import sys
 from setuptools import setup, find_packages
 
+try:
+    # Work around a traceback on Python < 2.7.4 and < 3.3.1
+    # http://bugs.python.org/issue15881#msg170215
+    import multiprocessing  # unused
+except ImportError:
+    pass
+
 SRC_DIR = 'src'
 
 
 def get_version():
-    import sys
-
     sys.path[:0] = [SRC_DIR]
     return __import__('javactl').__version__
 
@@ -21,10 +27,11 @@ def get_version():
     install_requires=[
         'pyyaml',
         'six',
+        'mog-commons',
     ],
     tests_require=[
-        'unittest2',
-        'mock',
+        'mock == 1.0.1',  # lock version for older version of setuptools
+        'jinja2' + (' == 2.6' if sys.version_info[:2] == (3, 2) else ''),
     ],
     package_dir={'': SRC_DIR},
     packages=find_packages(SRC_DIR),

diff --git a/src/backported/__init__.py b/src/backported/__init__.py
diff --git a/src/backported/logging/__init__.py b/src/backported/logging/__init__.py