From dfb5016cefc3bad21ab900a1c8196c46d6bd2297 Mon Sep 17 00:00:00 2001 From: Joel Akeret Date: Fri, 29 Dec 2017 09:36:38 +0100 Subject: [PATCH] tidy up --- setup.py | 31 +------------------------------ test/__init__.py | 0 test/test_tf_unet.py | 30 ------------------------------ 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 test/__init__.py delete mode 100644 test/test_tf_unet.py diff --git a/setup.py b/setup.py index 485dea7..8b3a54e 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,6 @@ #!/usr/bin/env python import os -import sys -from setuptools.command.test import test as TestCommand from setuptools import find_packages try: @@ -11,30 +9,7 @@ from distutils.core import setup -if sys.argv[-1] == 'publish': - os.system('python setup.py sdist upload') - sys.exit() - - -class PyTest(TestCommand): - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - errno = pytest.main(self.test_args) - sys.exit(errno) - - readme = open('README.rst').read() -doclink = """ -Documentation -------------- - -The full documentation can be generated with Sphinx""" - history = open('HISTORY.rst').read().replace('.. :changelog:', '') requires = [] #during runtime @@ -46,7 +21,7 @@ def run_tests(self): name='tf_unet', version='0.1.0', description='Unet TensorFlow implementation', - long_description=readme + '\n\n' + doclink + '\n\n' + history, + long_description=readme + '\n\n' + history, author='Joel Akeret', url='https://github.com/jakeret/tf_unet', packages=find_packages(PACKAGE_PATH, "test"), @@ -62,12 +37,8 @@ def run_tests(self): 'Intended Audience :: Developers', "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", 'Natural Language :: English', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', ], tests_require=tests_require, - cmdclass = {'test': PyTest}, ) diff --git a/test/__init__.py b/test/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/test/test_tf_unet.py b/test/test_tf_unet.py deleted file mode 100644 index bec973b..0000000 --- a/test/test_tf_unet.py +++ /dev/null @@ -1,30 +0,0 @@ - -# Copyright (C) 2016 ETH Zurich, Institute for Astronomy - -""" -Tests for `tf_unet` module. -""" -from __future__ import print_function, division, absolute_import, unicode_literals - -import pytest -from tf_unet import tf_unet - - -class TestTf_unet(object): - - def setup(self): - #prepare unit test. Load data etc - print("setting up " + __name__) - pass - - def test_something(self): - x = 1 - assert x==1 - - def teardown(self): - #tidy up - print("tearing down " + __name__) - pass - -if __name__ == '__main__': - pytest.main() \ No newline at end of file