Removed pyslalib from required dependencies (now optional)

This commit is contained in:
yosata committed 2020-06-07 18:58:30 +02:00
1 parent ed1fbcbc04
commit 56051bb6a5
2 files changed
+10 -6

No files matched your search

+6 -1
View File
@@ -193,7 +193,12 @@ def slalib(l, T=288.15, p=101325, H=0, h=0, lat=-24, tlr=0.0065, eps=1e-10):
Returns: Returns:
n - Refractive index of atmospheric air at the given conditions n - Refractive index of atmospheric air at the given conditions
''' '''
from pyslalib import slalib try:
from pyslalib import slalib
except ImportError as e:
print('pySLALIB package not found! Try installing it first.\nReturning n=1.')
return 1
zObs = np.deg2rad(45.06563) zObs = np.deg2rad(45.06563)
p = p/100 p = p/100
R = [] R = []
+4 -5
View File
@@ -21,14 +21,14 @@ def setup_package():
# write_version_py() # write_version_py()
setup(name='AstroAtmosphere', setup(name='AstroAtmosphere',
version='0.1.1', version='0.1.2',
description='Collection of equations for refractive index, refraction and dispersion calculations of atmospheric air.', description='Collection of equations for refractive index, refraction and dispersion calculations of atmospheric air.',
long_description=__readme__, long_description=__readme__,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
author='Joost van den Born', author='Joost van den Born',
author_email='born@astron.nl', author_email='born@astron.nl',
url='https://gitlab.astro-wise.org/micado/atmosphericmodel', url='https://gitlab.astro-wise.org/micado/atmosphericmodel',
download_url='https://gitlab.astro-wise.org/micado/atmosphericmodel/-/archive/v_01/atmosphericmodel-v_01.tar.gz', download_url='https://gitlab.astro-wise.org/micado/atmosphericmodel/-/archive/v_012/atmosphericmodel-v_012.tar.gz',
license='GNU General Public License v3', license='GNU General Public License v3',
data_files = [('',['LICENSE.txt'])], data_files = [('',['LICENSE.txt'])],
package_dir={'AstroAtmosphere': 'AstroAtmosphere'}, package_dir={'AstroAtmosphere': 'AstroAtmosphere'},
@@ -37,9 +37,8 @@ def setup_package():
packages=['AstroAtmosphere'], packages=['AstroAtmosphere'],
keywords=['REFRACTION','REFRACTIVITY','ATMOSPHERE','DISPERSION','CIDDOR'], keywords=['REFRACTION','REFRACTIVITY','ATMOSPHERE','DISPERSION','CIDDOR'],
install_requires=['numpy', install_requires=['numpy',
'scipy', 'scipy'],
'pyslalib>=1.0.4' extras_require={'slalib':['pyslalib>=1.0.4']},
],
classifiers=['Programming Language :: Python :: 3', classifiers=['Programming Language :: Python :: 3',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Intended Audience :: Science/Research', 'Intended Audience :: Science/Research',