Repository: incubator-senssoft-distill
Updated Branches:
  refs/heads/master 3d5158e35 -> e0995bec5


Producing coverage reports and implemented pylint output.


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/e0995bec
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/e0995bec
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/e0995bec

Branch: refs/heads/master
Commit: e0995bec55fd36f8ddefb9d9f9e5f68615e1a439
Parents: 3d5158e
Author: mooshu1x2 <mbe...@draper.com>
Authored: Thu Oct 13 17:10:04 2016 -0400
Committer: mooshu1x2 <mbe...@draper.com>
Committed: Thu Oct 13 17:10:04 2016 -0400

----------------------------------------------------------------------
 setup.cfg             |  7 +++++--
 setup.py              | 27 +++++++--------------------
 test_requirements.txt | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/e0995bec/setup.cfg
----------------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index c92ce1f..08020f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,11 +14,14 @@
 # limitations under the License.
 
 [egg_info]
-tag_build = 1.0
+tag_build = 0.1.4
 tag_svn_revision = false
 
+[aliases]
+test=pytest
+
 [tool:pytest] 
-addopts = --ignore=build --ignore=setup.py --ignore=dist --doctest-modules 
--junitxml=results.xml
+addopts = --verbose --ignore=build --ignore=setup.py --ignore=dist 
--junitxml=test-report.xml --cov-report xml --cov=distill distill/. 
 norecursedirs = *.eggs *env* .git 
 
 [build_sphinx]

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/e0995bec/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 4e9beb9..8ddd32f 100644
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,10 @@
 
 from __future__ import absolute_import
 from setuptools import setup, find_packages
+import distutils.cmd
+import distutils.log
 from setuptools.command.test import test as TestCommand
-import io, os, sys
+import io, os, sys, subprocess
 
 if sys.version_info[:2] < (2, 7):
     m = "Python 2.7 or later is required for Distill (%d.%d detected)."
@@ -35,21 +37,6 @@ def read (*filenames, **kwargs):
             buf.append (f.read ())
     return sep.join (buf)
 
-# This is a plug-in for setuptools that will invoke py.test
-# when you run python setup.py test
-class PyTest (TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def run_tests(self):
-        #import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
 # Get the version string
 def get_version ():
     basedir = os.path.dirname (__file__)
@@ -62,7 +49,7 @@ def get_version ():
 setup (
     name = "Distill",
     version = get_version (),
-    url = "https://github.com/draperlaboratory/distill";,
+    url = "https://github.com/apache/incubator-senssoft-distill";,
     license = "Apache Software License",
     author = "Michelle Beard",
     author_email = "msbe...@apache.org",
@@ -79,12 +66,12 @@ setup (
       'Operating System :: OS Independent', 
       'Private :: Do Not Upload"'
     ],
-    keywords = "stout userale tap", # Separate with spaces
+    keywords = "stout userale tap distill", # Separate with spaces
     packages = find_packages (exclude=['examples', 'tests']),
     include_package_data = True,
     zip_safe = False,
-    tests_require = ['pytest>=3.0.0'],
-    cmdclass = {'test': PyTest},
+    setup_requires = ['pytest-runner'],
+    tests_require = ['pytest>=3.0.0', 'pytest-pylint', 'coverage'],
     install_requires = ['Flask==0.10.1', 
                         #'networkx==1.11',
                         'elasticsearch-dsl==2.0.0', 

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/e0995bec/test_requirements.txt
----------------------------------------------------------------------
diff --git a/test_requirements.txt b/test_requirements.txt
new file mode 100644
index 0000000..3201881
--- /dev/null
+++ b/test_requirements.txt
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+pylint==1.6.4
+pytest==3.0.3
+pytest-cov==2.4.0
+pytest-runner==2.9
+pytest-pylint
+coverage==4.2

Reply via email to