Skip to content

Commit

Permalink
Clean-up
Browse files Browse the repository at this point in the history
Former-commit-id: 0c633fbc845d41d06287c6c1b5f0eca08dc7e3fc [formerly 7e76ccb]
Former-commit-id: f38ee898d9d4d6e005edc5162e8ade589d14bc86
  • Loading branch information
calum-chamberlain committed Mar 8, 2016
1 parent 8b82de6 commit 1a526c1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 41 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[metadata]
description-file = REAME.md
[aliases]
test=pytest
test = pytest
40 changes: 0 additions & 40 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,7 @@
long_description = read_md('README.md')

# Get a list of all the scripts not to be installed
# scriptfiles = glob.glob('eqcorrscan/scripts/*.py')
# scriptfiles += glob.glob('eqcorrscan/*.sl')
scriptfiles = glob.glob('eqcorrscan/tutorials/*.py')
# scriptfiles += glob.glob('eqcorrscan/WHATVsearch.py')
# scriptfiles += glob.glob('eqcorrscan/LFE_brightness_search.py')
# scriptfiles += glob.glob('eqcorrscan/synth_test.py')


# Make our own testing command
class PyTest(TestCommand):
user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]

def initialize_options(self):
TestCommand.initialize_options(self)
self.pytest_args = []

def run_tests(self):
# import here: outside the eggs aren't loaded
import pytest
errno = pytest.main(self.pytest_args)
sys.exit(errno)

setup(
name='EQcorrscan',
Expand Down Expand Up @@ -141,24 +121,4 @@ def run_tests(self):
# 'test': ['coverage'],
# },

# If there are data files included in your packages that need to be
# installed, specify them here. If using Python 2.6 or less, then these
# have to be included in MANIFEST.in as well.
# package_data={
# 'tutorial_data': ['test_data'],
# },

# Although 'package_data' is the preferred approach, in some case you may
# need to place data files outside of your packages. See:
# In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
# data_files=[('tutorial_data')],

# To provide executable scripts, use entry points in preference to the
# "scripts" keyword. Entry points provide cross-platform support and allow
# pip to create the appropriate form of executable for the target platform.
# entry_points={
# 'console_scripts': [
# 'sample=sample:main',
# ],
# },
)

0 comments on commit 1a526c1

Please sign in to comment.