From 2b9964ee25bc2b03fbe378639a4300fc1d8cc7b7 Mon Sep 17 00:00:00 2001 From: bnavigator Date: Fri, 24 Jul 2020 12:53:06 +0200 Subject: [PATCH 1/2] remove outdated and unused runtests.py --- runtests.py | 390 ---------------------------------------------------- 1 file changed, 390 deletions(-) delete mode 100644 runtests.py diff --git a/runtests.py b/runtests.py deleted file mode 100644 index 8bf3dfb95..000000000 --- a/runtests.py +++ /dev/null @@ -1,390 +0,0 @@ -#!/usr/bin/env python -""" -runtests.py [OPTIONS] [-- ARGS] - -Run tests, building the project first. - -Examples:: - - $ python runtests.py - $ python runtests.py -s {SAMPLE_SUBMODULE} - $ python runtests.py -t {SAMPLE_TEST} - $ python runtests.py --ipython - $ python runtests.py --python somescript.py - -Run a debugger: - - $ gdb --args python runtests.py [...other args...] - -Generate C code coverage listing under build/lcov/: -(requires http://ltp.sourceforge.net/coverage/lcov.php) - - $ python runtests.py --gcov [...other args...] - $ python runtests.py --lcov-html - -""" - -# -# This is a generic test runner script for projects using Numpy's test -# framework. Change the following values to adapt to your project: -# - -PROJECT_MODULE = "control" -PROJECT_ROOT_FILES = ['control', 'setup.py'] -SAMPLE_TEST = "" -SAMPLE_SUBMODULE = "" - -EXTRA_PATH = ['/usr/lib/ccache', '/usr/lib/f90cache', - '/usr/local/lib/ccache', '/usr/local/lib/f90cache'] - -# --------------------------------------------------------------------- - - -if __doc__ is None: - __doc__ = "Run without -OO if you want usage info" -else: - __doc__ = __doc__.format(**globals()) - - -import sys -import os -import traceback -import warnings - -#warnings.simplefilter("ignore", DeprecationWarning) - -def warn_with_traceback(message, category, filename, lineno, file=None, line=None): - traceback.print_stack() - log = file if hasattr(file, 'write') else sys.stderr - log.write(warnings.formatwarning(message, category, filename, lineno, line)) - -warnings.showwarnings = warn_with_traceback - -# In case we are run from the source directory, we don't want to import the -# project from there: -sys.path.pop(0) - -import shutil -import subprocess -import time -import imp -from argparse import ArgumentParser, REMAINDER - -ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__))) - -def main(argv): - parser = ArgumentParser(usage=__doc__.lstrip()) - parser.add_argument("--verbose", "-v", action="count", default=1, - help="more verbosity") - parser.add_argument("--no-build", "-n", action="store_true", default=False, - help="do not build the project (use system installed version)") - parser.add_argument("--build-only", "-b", action="store_true", default=False, - help="just build, do not run any tests") - parser.add_argument("--doctests", action="store_true", default=False, - help="Run doctests in module") - parser.add_argument("--coverage_html", action="store_true", default=False, - help=("report coverage of project code. HTML output goes " - "under build/coverage")) - parser.add_argument("--coverage", action="store_true", default=False, - help=("report coverage of project code.")) - parser.add_argument("--gcov", action="store_true", default=False, - help=("enable C code coverage via gcov (requires GCC). " - "gcov output goes to build/**/*.gc*")) - parser.add_argument("--lcov-html", action="store_true", default=False, - help=("produce HTML for C code coverage information " - "from a previous run with --gcov. " - "HTML output goes to build/lcov/")) - parser.add_argument("--mode", "-m", default="fast", - help="'fast', 'full', or something that could be " - "passed to nosetests -A [default: fast]") - parser.add_argument("--submodule", "-s", default=None, - help="Submodule whose tests to run (cluster, constants, ...)") - parser.add_argument("--pythonpath", "-p", default=None, - help="Paths to prepend to PYTHONPATH") - parser.add_argument("--tests", "-t", action='append', - help="Specify tests to run") - parser.add_argument("--python", action="store_true", - help="Start a Python shell with PYTHONPATH set") - parser.add_argument("--ipython", "-i", action="store_true", - help="Start IPython shell with PYTHONPATH set") - parser.add_argument("--shell", action="store_true", - help="Start Unix shell with PYTHONPATH set") - parser.add_argument("--debug", "-g", action="store_true", - help="Debug build") - parser.add_argument("--show-build-log", action="store_true", - help="Show build output rather than using a log file") - parser.add_argument("args", metavar="ARGS", default=[], nargs=REMAINDER, - help="Arguments to pass to Nose, Python or shell") - args = parser.parse_args(argv) - - if args.lcov_html: - # generate C code coverage output - lcov_generate() - sys.exit(0) - - if args.pythonpath: - for p in reversed(args.pythonpath.split(os.pathsep)): - sys.path.insert(0, p) - - if args.gcov: - gcov_reset_counters() - - if not args.no_build: - site_dir = build_project(args) - sys.path.insert(0, site_dir) - os.environ['PYTHONPATH'] = site_dir - - extra_argv = args.args[:] - if extra_argv and extra_argv[0] == '--': - extra_argv = extra_argv[1:] - - if args.python: - if extra_argv: - # Don't use subprocess, since we don't want to include the - # current path in PYTHONPATH. - sys.argv = extra_argv - with open(extra_argv[0], 'r') as f: - script = f.read() - sys.modules['__main__'] = imp.new_module('__main__') - ns = dict(__name__='__main__', - __file__=extra_argv[0]) - exec_(script, ns) - sys.exit(0) - else: - import code - code.interact() - sys.exit(0) - - if args.ipython: - import IPython - IPython.embed(user_ns={}) - sys.exit(0) - - if args.shell: - shell = os.environ.get('SHELL', 'sh') - print("Spawning a Unix shell...") - os.execv(shell, [shell] + extra_argv) - sys.exit(1) - - if args.coverage_html: - dst_dir = os.path.join(ROOT_DIR, 'build', 'coverage') - fn = os.path.join(dst_dir, 'coverage_html.js') - if os.path.isdir(dst_dir) and os.path.isfile(fn): - shutil.rmtree(dst_dir) - extra_argv += ['--cover-html', - '--cover-html-dir='+dst_dir] - - if args.coverage: - extra_argv += ['--cover-erase', '--with-coverage', - '--cover-package=control'] - - test_dir = os.path.join(ROOT_DIR, 'build', 'test') - - if args.build_only: - sys.exit(0) - elif args.submodule: - modname = PROJECT_MODULE + '.' + args.submodule - try: - __import__(modname) - test = sys.modules[modname].test - except (ImportError, KeyError, AttributeError): - print("Cannot run tests for %s" % modname) - sys.exit(2) - elif args.tests: - def fix_test_path(x): - # fix up test path - p = x.split(':') - p[0] = os.path.relpath(os.path.abspath(p[0]), - test_dir) - return ':'.join(p) - - tests = [fix_test_path(x) for x in args.tests] - - def test(*a, **kw): - extra_argv = kw.pop('extra_argv', ()) - extra_argv = extra_argv + tests[1:] - kw['extra_argv'] = extra_argv - from numpy.testing import Tester - return Tester(tests[0]).test(*a, **kw) - else: - __import__(PROJECT_MODULE) - test = sys.modules[PROJECT_MODULE].test - - # Run the tests under build/test - try: - shutil.rmtree(test_dir) - except OSError: - pass - try: - os.makedirs(test_dir) - except OSError: - pass - - cwd = os.getcwd() - try: - os.chdir(test_dir) - result = test(args.mode, - verbose=args.verbose, - extra_argv=extra_argv, - doctests=args.doctests, - coverage=args.coverage) - finally: - os.chdir(cwd) - - if result.wasSuccessful(): - sys.exit(0) - else: - sys.exit(1) - - -def build_project(args): - """ - Build a dev version of the project. - - Returns - ------- - site_dir - site-packages directory where it was installed - - """ - - root_ok = [os.path.exists(os.path.join(ROOT_DIR, fn)) - for fn in PROJECT_ROOT_FILES] - if not all(root_ok): - print("To build the project, run runtests.py in " - "git checkout or unpacked source") - sys.exit(1) - - dst_dir = os.path.join(ROOT_DIR, 'build', 'testenv') - - env = dict(os.environ) - cmd = [sys.executable, 'setup.py'] - - # Always use ccache, if installed - env['PATH'] = os.pathsep.join(EXTRA_PATH + env.get('PATH', '').split(os.pathsep)) - - if args.debug or args.gcov: - # assume everyone uses gcc/gfortran - env['OPT'] = '-O0 -ggdb' - env['FOPT'] = '-O0 -ggdb' - if args.gcov: - import distutils.sysconfig - cvars = distutils.sysconfig.get_config_vars() - env['OPT'] = '-O0 -ggdb' - env['FOPT'] = '-O0 -ggdb' - env['CC'] = cvars['CC'] + ' --coverage' - env['CXX'] = cvars['CXX'] + ' --coverage' - env['F77'] = 'gfortran --coverage ' - env['F90'] = 'gfortran --coverage ' - env['LDSHARED'] = cvars['LDSHARED'] + ' --coverage' - env['LDFLAGS'] = " ".join(cvars['LDSHARED'].split()[1:]) + ' --coverage' - cmd += ["build"] - - cmd += ['install', '--prefix=' + dst_dir] - - log_filename = os.path.join(ROOT_DIR, 'build.log') - - if args.show_build_log: - ret = subprocess.call(cmd, env=env, cwd=ROOT_DIR) - else: - log_filename = os.path.join(ROOT_DIR, 'build.log') - print("Building, see build.log...") - with open(log_filename, 'w') as log: - p = subprocess.Popen(cmd, env=env, stdout=log, stderr=log, - cwd=ROOT_DIR) - - # Wait for it to finish, and print something to indicate the - # process is alive, but only if the log file has grown (to - # allow continuous integration environments kill a hanging - # process accurately if it produces no output) - last_blip = time.time() - last_log_size = os.stat(log_filename).st_size - while p.poll() is None: - time.sleep(0.5) - if time.time() - last_blip > 60: - log_size = os.stat(log_filename).st_size - if log_size > last_log_size: - print(" ... build in progress") - last_blip = time.time() - last_log_size = log_size - - ret = p.wait() - - if ret == 0: - print("Build OK") - else: - if not args.show_build_log: - with open(log_filename, 'r') as f: - print(f.read()) - print("Build failed!") - sys.exit(1) - - from distutils.sysconfig import get_python_lib - site_dir = get_python_lib(prefix=dst_dir, plat_specific=True) - - return site_dir - - -# -# GCOV support -# -def gcov_reset_counters(): - print("Removing previous GCOV .gcda files...") - build_dir = os.path.join(ROOT_DIR, 'build') - for dirpath, dirnames, filenames in os.walk(build_dir): - for fn in filenames: - if fn.endswith('.gcda') or fn.endswith('.da'): - pth = os.path.join(dirpath, fn) - os.unlink(pth) - -# -# LCOV support -# - -LCOV_OUTPUT_FILE = os.path.join(ROOT_DIR, 'build', 'lcov.out') -LCOV_HTML_DIR = os.path.join(ROOT_DIR, 'build', 'lcov') - -def lcov_generate(): - try: os.unlink(LCOV_OUTPUT_FILE) - except OSError: pass - try: shutil.rmtree(LCOV_HTML_DIR) - except OSError: pass - - print("Capturing lcov info...") - subprocess.call(['lcov', '-q', '-c', - '-d', os.path.join(ROOT_DIR, 'build'), - '-b', ROOT_DIR, - '--output-file', LCOV_OUTPUT_FILE]) - - print("Generating lcov HTML output...") - ret = subprocess.call(['genhtml', '-q', LCOV_OUTPUT_FILE, - '--output-directory', LCOV_HTML_DIR, - '--legend', '--highlight']) - if ret != 0: - print("genhtml failed!") - else: - print("HTML output generated under build/lcov/") - - -# -# Python 3 support -# - -if sys.version_info[0] >= 3: - import builtins - exec_ = getattr(builtins, "exec") -else: - def exec_(code, globs=None, locs=None): - """Execute code in a namespace.""" - if globs is None: - frame = sys._getframe(1) - globs = frame.f_globals - if locs is None: - locs = frame.f_locals - del frame - elif locs is None: - locs = globs - exec("""exec code in globs, locs""") - -if __name__ == "__main__": - main(argv=sys.argv[1:]) From 9286831f54d327ab8f8654c78d3c897400d47c66 Mon Sep 17 00:00:00 2001 From: bnavigator Date: Fri, 24 Jul 2020 12:54:54 +0200 Subject: [PATCH 2/2] remove oldstyle and nose references --- README.rst | 12 +++++++++--- setup.py | 6 ++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 97c1cc96c..d7c1306b5 100644 --- a/README.rst +++ b/README.rst @@ -99,10 +99,16 @@ You can check out the latest version of the source code with the command:: Testing ------- -You can run a set of unit tests to make sure that everything is working -correctly. After installation, run:: +You can run the unit tests with `pytest`_ to make sure that everything is +working correctly. Inside the source directory, run:: - python setup.py test + pytest -v + +or to test the installed package:: + + pytest --pyargs control -v + +.. _pytest: https://docs.pytest.org/ License ------- diff --git a/setup.py b/setup.py index cd4bcbf9f..ea825d471 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,8 @@ Programming Language :: Python :: 3 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 +Programming Language :: Python :: 3.7 +Programming Language :: Python :: 3.8 Topic :: Software Development Topic :: Scientific/Engineering Operating System :: Microsoft :: Windows @@ -42,8 +44,4 @@ install_requires=['numpy', 'scipy', 'matplotlib'], - tests_require=['scipy', - 'matplotlib', - 'nose'], - test_suite = 'nose.collector', ) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy