Repository: incubator-senssoft-distill Updated Branches: refs/heads/master 45f6f9076 -> 9d90328ec
Updated pytest configurations. 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/9d90328e Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/9d90328e Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/9d90328e Branch: refs/heads/master Commit: 9d90328ecf10c332e6ba953dd4852e395039ef14 Parents: 45f6f90 Author: mooshu1x2 <mbe...@draper.com> Authored: Fri Sep 30 14:44:32 2016 -0400 Committer: mooshu1x2 <mbe...@draper.com> Committed: Fri Sep 30 14:44:32 2016 -0400 ---------------------------------------------------------------------- docs/source/installation.rst | 4 ++-- requirements.txt | 8 ++++---- setup.cfg | 6 +++--- setup.py | 17 +++++++++-------- 4 files changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/9d90328e/docs/source/installation.rst ---------------------------------------------------------------------- diff --git a/docs/source/installation.rst b/docs/source/installation.rst index e0bf00c..fa92a62 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -76,7 +76,7 @@ Install Apache Distill requirements: :: - $ env/bin/pip -r requirements.txt + $ env/bin/pip install -r requirements.txt To build the source code and run all unit tests. @@ -175,7 +175,7 @@ Installing Documentation To save yourself the trouble, all up to date documentation is available at https://draperlaboratory.github.io/distill/. -However, if you want to manully build the documentation, the instructions are below. +However, if you want to manually build the documentation, the instructions are below. First, install the documentation dependencies: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/9d90328e/requirements.txt ---------------------------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index f759856..5137ad9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,9 +14,9 @@ # limitations under the License. Flask==0.10.1 -networkx==1.11 +#networkx==1.11 elasticsearch-dsl==2.0.0 -numpy>=1.10.0 -scipy>=0.17.0 +#numpy>=1.10.0 +#scipy>=0.17.0 pandas>=0.18.1 -pytest>=2.9.0 \ No newline at end of file +pytest>=3.0.0 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/9d90328e/setup.cfg ---------------------------------------------------------------------- diff --git a/setup.cfg b/setup.cfg index daaed8a..ffde7ed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,9 +17,9 @@ tag_build = 1.0 tag_svn_revision = false -[pytest] -addopts = --ignore=setup.py --ignore=build --ignore=dist --doctest-modules -norecursedirs=*.egg +[tool:pytest] +addopts = --verbose --ignore=setup.py --ignore=build --ignore=dist --doctest-modules +norecursedirs = *.eggs env [build_sphinx] source-dir = docs http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/9d90328e/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index aa474d2..8bcda73 100644 --- a/setup.py +++ b/setup.py @@ -38,14 +38,16 @@ def read (*filenames, **kwargs): # This is a plug-in for setuptools that will invoke py.test # when you run python setup.py test class PyTest (TestCommand): + def finalize_options (self): TestCommand.finalize_options (self) self.test_args = [] self.test_suite = True def run_tests (self): - import pytest # import here, because outside the required eggs aren't loaded yet - sys.exit (pytest.main (self.test_args)) + import pytest # import here, because outside the required eggs aren't loaded yet + errno = pytest.main (self.test_args) + sys.exit (errno) # Get the version string def get_version (): @@ -80,14 +82,13 @@ setup ( packages = find_packages (exclude=['examples', 'tests']), include_package_data = True, zip_safe = False, - tests_require = ['pytest>=2.9.0'], + tests_require = ['pytest>=3.0.0'], cmdclass = {'test': PyTest}, install_requires = ['Flask==0.10.1', - 'networkx==1.11', + #'networkx==1.11', 'elasticsearch-dsl==2.0.0', - 'numpy>=1.10.0', - 'scipy>=0.17.0', - 'sphinx>=1.4.0', + #'numpy>=1.10.0', + #'scipy>=0.17.0', 'pandas>=0.18.1' ], entry_points = { @@ -95,4 +96,4 @@ setup ( 'dev = distill.server:dev_server' ] } -) +) \ No newline at end of file
