Skip to content

Commit

Permalink
Merge pull request #8 from ChrisBarker-NOAA/move_tests
Browse files Browse the repository at this point in the history
Move unit tests inside tamoc package as new sub-package.
  • Loading branch information
socolofs authored Apr 30, 2020
2 parents c96f4b1 + f9a50a5 commit 4333e97
Show file tree
Hide file tree
Showing 16 changed files with 1,046 additions and 1,046 deletions.
10 changes: 9 additions & 1 deletion .cache/v/cache/lastfailed
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
{}
{
"::test_cubic_solver": true,
"::test_ellipsoid": true,
"::test_equilibrium": true,
"::test_rigid": true,
"::test_sintef_module": true,
"::test_sphere": true,
"::test_spherical_cap": true
}
167 changes: 83 additions & 84 deletions README.rst

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conda_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ scipy>=1.2
netcdf4

# build requirements
# A modern Fortran compiler
fortran-compiler

# test requirements
pytest
Expand Down
31 changes: 15 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,19 @@ def get_version(pkg_name):

from numpy.distutils.core import setup

setup(
name='TAMOC',
version=get_version("tamoc"),
description='Texas A&M Oilspill Calculator',
long_description=open('README.rst').read(),
license='LICENSE.txt',
author='Scott A. Socolofsky',
author_email='[email protected]',
url="https://ceprofs.civil.tamu.edu/ssocolofsky/",
scripts=bin_files,
packages=['tamoc'],
package_data={'tamoc': ['data/*.csv', 'data/*.cnv', 'data/*.dat']},
platforms=['any'],
ext_package='tamoc',
ext_modules=[ext_dbm_f],
classifiers=filter(None, classifiers.split("\n")),
setup(name='TAMOC',
version=get_version("tamoc"),
description='Texas A&M Oilspill Calculator',
long_description=open('README.rst').read(),
license='LICENSE.txt',
author='Scott A. Socolofsky',
author_email='[email protected]',
url="https://ceprofs.civil.tamu.edu/ssocolofsky/",
scripts=bin_files,
packages=['tamoc', 'tamoc.test'],
package_data={'tamoc': ['data/*.csv', 'data/*.cnv', 'data/*.dat']},
platforms=['any'],
ext_package='tamoc',
ext_modules=[ext_dbm_f],
classifiers=filter(None, classifiers.split("\n")),
)
2 changes: 1 addition & 1 deletion tamoc/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.0.0"
__version__ = "2.0.1"
File renamed without changes.
Loading

0 comments on commit 4333e97

Please sign in to comment.