diff --git a/setup.py b/setup.py index 56c89bab2e1e8d11c41982fc28702665ebc60d4f..be02bd9aba247471d3d9fe233788cd2d750cab31 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ extensions = [generate_extension('usgscam.genericframe', ['usgscam/genericframe. setup( name='usgscam', - version='0.1.0', + version='0.1.1', ext_modules=cythonize(extensions), description='Cython wrapper to the USGS MDIS Camera Model', author='Jay Laura', diff --git a/tests/test_generic_frame.py b/tests/test_generic_frame.py index eec33d10c71f7cc26ada0d68b18bc080ddea3323..05a19bc981f50f3e1f71949dc82c8f4a930c69fa 100644 --- a/tests/test_generic_frame.py +++ b/tests/test_generic_frame.py @@ -35,7 +35,6 @@ class TestCassiniNAC: - class TestMdisWac: @pytest.mark.parametrize('image, ground',[ ((512, 512, 0), (-73589.5516508502, 562548.342040933, 2372508.44060771)), diff --git a/usgscam/__init__.py b/usgscam/__init__.py index 1e144369f4a8bf7f878f01e2c3bfdcb587c1b9bd..c0b14c512b52578fa3535b277fd301843a1e29ad 100644 --- a/usgscam/__init__.py +++ b/usgscam/__init__.py @@ -1,5 +1,20 @@ + +from pkg_resources import get_distribution, DistributionNotFound +import os.path + +try: + _dist = get_distribution('autocnet') + # Normalize case for Windows systems + dist_loc = os.path.normcase(_dist.location) + here = os.path.normcase(__file__) + if not here.startswith(os.path.join(dist_loc, 'autocnet')): + # not installed, but there is another version that *is* + raise DistributionNotFound +except DistributionNotFound: + __version__ = 'Please install this project with setup.py' +else: + __version__ = _dist.version + import usgscam.genericframe -import usgscam.orex import usgscam.genericls -#from usgscam import mdis -#from usgscam import orex +import usgscam.orex