skycalc-cli 1.3__tar.gz → 1.5__tar.gz

skycalc_cli-1.5/PKG-INFO

@@ -0,0 +1,40 @@
+Metadata-Version: 2.1
+Name: skycalc_cli
+Version: 1.5
+Summary: ESO SkyCalc Command Line Interface
+Home-page: http://www.eso.org/observing/etc/bin/gen/form?INS.MODE=swspectr+INS.NAME=SKYCALC
+Author: European Southern Observatory
+Author-email: usd-help@eso.org
+License: MIT
+Keywords: sky model observatory telescope astronomy ephemeris sun moon
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Requires-Python: >=3.8
+License-File: LICENSE.txt
+Requires-Dist: requests
+
+######################################
+ SkyCalc Command Line Interface (CLI)
+######################################
+
+============
+Installation
+============
+
+The SkyCalc CLI requires Python 3.8 or later (Python 2 users: pip installs
+the last compatible release, 1.4). Install the SkyCalc CLI
+on your computer using the command: ::
+
+    pip install --user skycalc_cli
+
+This will also install skycalc_cli's dependency, i.e. the requests package for
+making HTTP calls.
+
+=============
+Documentation
+=============
+
+Documentation can be found on the `ESO SkyCalc Web Page <https://www.eso.org/observing/etc/doc/skycalc/helpskycalccli.html>`_.

{skycalc_cli-1.3 → skycalc_cli-1.5}/README.rst

@@ -6,7 +6,8 @@
 Installation
 ============
 
-The SkyCalc CLI works in Python 2.7 or Python3. Install the SkyCalc CLI
+The SkyCalc CLI requires Python 3.8 or later (Python 2 users: pip installs
+the last compatible release, 1.4). Install the SkyCalc CLI
 on your computer using the command: ::
 
     pip install --user skycalc_cli

{skycalc_cli-1.3 → skycalc_cli-1.5}/setup.py

@@ -8,18 +8,14 @@ def readme():
 
 
 setup(name='skycalc_cli',
-      version='1.3',
+      version='1.5',
       description='ESO SkyCalc Command Line Interface',
       long_description=readme(),
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'License :: OSI Approved :: MIT License',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3 :: Only',
           'Topic :: Scientific/Engineering :: Astronomy',
       ],
       keywords='sky model observatory telescope astronomy ephemeris sun moon',
@@ -29,10 +25,9 @@ setup(name='skycalc_cli',
       author_email='usd-help@eso.org',
       license='MIT',
       packages=['skycalc_cli'],
-      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
+      python_requires='>=3.8',
       install_requires=[
           'requests',
-          'setuptools'
       ],
       entry_points={
           'console_scripts': ['skycalc_cli=skycalc_cli.skycalc_cli:main'],

{skycalc_cli-1.3 → skycalc_cli-1.5}/skycalc_cli/skycalc.py

@@ -2,20 +2,35 @@
 """skycalc Module"""
 
 from __future__ import print_function
+import os
 import sys
 import json
 from datetime import datetime
 import requests
 
+# Base URL of the SkyCalc service (an ETC web installation). The CLI uses its
+# CGI scripts under bin/script and the result directory tmp. This is the only
+# place a server name appears; the backend is planned to move to a stable
+# name under etc.eso.org, at which point only this constant changes.
+# Override with the environment variable SKYCALC_CLI_BASE_URL or the base_url
+# argument of SkyModel and AlmanacQuery, e.g.
+# 'http://localhost:8080/observing/etc' for a local etc1 container.
+DEFAULT_BASE_URL = 'https://etimecalret-002.eso.org/observing/etc'
+
+
+def get_base_url(base_url=None):
+    """Return the base URL to use, without a trailing slash."""
+    url = base_url or os.environ.get('SKYCALC_CLI_BASE_URL') or DEFAULT_BASE_URL
+    return url.rstrip('/')
+
 
 class AlmanacQuery:
     """AlmanacQuery for Querying the SkyCalc Almanac"""
 
-    def __init__(self, indic):
+    def __init__(self, indic, base_url=None):
 
         self.almdata = None
-        self.almserver = 'http://etimecalret-001.eso.org'
-        self.almurl = '/observing/etc/api/skycalc_almanac'
+        self.almurl = get_base_url(base_url) + '/bin/script/skycalc_almanac.py'
 
         # Left: users keyword (skycalc_cli),
         # Right: skycalc Almanac output keywords
@@ -100,11 +115,9 @@ class AlmanacQuery:
 
     def query(self):
 
-        url = self.almserver + self.almurl
-
         rawdata = None
         try:
-            response = requests.post(url, json.dumps(self.almindic))
+            response = requests.post(self.almurl, data=json.dumps(self.almindic))
             rawdata = response.text
         except requests.exceptions.RequestException as e:
             print('Error: Almanac query failed.')
@@ -153,13 +166,13 @@ class bcolors:
 class SkyModel:
     """SkyModel for querying the Advanced SkyModel"""
 
-    def __init__(self):
+    def __init__(self, base_url=None):
 
         self.stop_on_errors_and_exceptions = True
         self.data = None
-        self.server = 'http://etimecalret-001.eso.org'
-        self.url = self.server + '/observing/etc/api/skycalc'
-        self.deleter_script_url = self.server + '/observing/etc/api/rmtmp'
+        self.base_url = get_base_url(base_url)
+        self.url = self.base_url + '/bin/script/skycalc_api.py'
+        self.deleter_script_url = self.base_url + '/bin/script/rmtmp.py'
         self.bugreport_text = ''
         self.tmpdir = ''
         self.params = {
@@ -253,11 +266,13 @@ class SkyModel:
             # lam/dlam where dlam is wavelength step (not the res.element)
             'wres': 20000,
             'wgrid_user': [500.0, 510.0, 520.0, 530.0, 540.0, 550.0],
-            # Convolve by Line Spread Function
+            # convolve by Line Spread Function
             'lsf_type': 'none',   # string grid ['none','Gaussian','Boxcar']
             'lsf_gauss_fwhm': 5.0,      # wavelength bins float > 0
             'lsf_boxcar_fwhm': 5.0,     # wavelength bins float > 0
-            'observatory': 'paranal'    # paranal
+            'observatory': 'paranal',   # paranal
+            # compute temperature and bolometric radiance
+            'temp_flag': 1
         }
 
     def handle_exception(self, e, msg):
@@ -318,8 +333,7 @@ class SkyModel:
             self.handle_exception(
                 e, 'Exception raised trying to decode server response ')
 
-        tmpurl = self.server + '/observing/etc/tmp/' + \
-            tmpdir + '/skytable.fits'
+        tmpurl = self.base_url + '/tmp/' + tmpdir + '/skytable.fits'
 
         if(status == 'success'):
             try:
@@ -341,17 +355,14 @@ class SkyModel:
 
     def callwith(self, newparams):
         for key, val in newparams.items():
-            if key in self.params:  # valid
-                self.params[key] = val
-            else:  # invalid
-                print('callwith() ignoring invalid keyword: ', key)
+            self.params[key] = val
         self.call()
 
     def printparams(self, keys=None):
         if keys is None:
             p = self.params
         else:
-            p = dict((k, self.params[k]) for k in keys if k in self.params)
+            p = dict((k, self.params[k]) for k in keys)
         for k in p:
             print(k, p[k])
 

{skycalc_cli-1.3 → skycalc_cli-1.5}/skycalc_cli/skycalc_cli.py

@@ -6,7 +6,6 @@
 # please contact usd-help@eso.org
 
 from __future__ import print_function
-import pkg_resources
 import sys
 import json
 import getopt
@@ -100,9 +99,9 @@ def main():
         if opt in ("-h", "--help"):
             usage()
             sys.exit()
-        elif opt in ("--version"):
-            version = pkg_resources.require("skycalc_cli")[0].version
-            print('skycalc_cli version ' + version)
+        elif opt == "--version":
+            from importlib.metadata import version as pkg_version
+            print('skycalc_cli version ' + pkg_version('skycalc_cli'))
             sys.exit(0)
         elif opt in ("-v", "--verbose"):
             isVerbose = True

skycalc_cli-1.5/skycalc_cli.egg-info/PKG-INFO

@@ -0,0 +1,40 @@
+Metadata-Version: 2.1
+Name: skycalc_cli
+Version: 1.5
+Summary: ESO SkyCalc Command Line Interface
+Home-page: http://www.eso.org/observing/etc/bin/gen/form?INS.MODE=swspectr+INS.NAME=SKYCALC
+Author: European Southern Observatory
+Author-email: usd-help@eso.org
+License: MIT
+Keywords: sky model observatory telescope astronomy ephemeris sun moon
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Requires-Python: >=3.8
+License-File: LICENSE.txt
+Requires-Dist: requests
+
+######################################
+ SkyCalc Command Line Interface (CLI)
+######################################
+
+============
+Installation
+============
+
+The SkyCalc CLI requires Python 3.8 or later (Python 2 users: pip installs
+the last compatible release, 1.4). Install the SkyCalc CLI
+on your computer using the command: ::
+
+    pip install --user skycalc_cli
+
+This will also install skycalc_cli's dependency, i.e. the requests package for
+making HTTP calls.
+
+=============
+Documentation
+=============
+
+Documentation can be found on the `ESO SkyCalc Web Page <https://www.eso.org/observing/etc/doc/skycalc/helpskycalccli.html>`_.

{skycalc_cli-1.3 → skycalc_cli-1.5}/skycalc_cli.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 skycalc_cli = skycalc_cli.skycalc_cli:main
-

skycalc_cli-1.5/skycalc_cli.egg-info/requires.txt

@@ -0,0 +1 @@
+requests

skycalc_cli-1.3/PKG-INFO

@@ -1,43 +0,0 @@
-Metadata-Version: 1.2
-Name: skycalc_cli
-Version: 1.3
-Summary: ESO SkyCalc Command Line Interface
-Home-page: http://www.eso.org/observing/etc/bin/gen/form?INS.MODE=swspectr+INS.NAME=SKYCALC
-Author: European Southern Observatory
-Author-email: usd-help@eso.org
-License: MIT
-Description-Content-Type: UNKNOWN
-Description: ######################################
-         SkyCalc Command Line Interface (CLI)
-        ######################################
-        
-        ============
-        Installation
-        ============
-        
-        The SkyCalc CLI works in Python 2.7 or Python3. Install the SkyCalc CLI
-        on your computer using the command: ::
-        
-            pip install --user skycalc_cli
-        
-        This will also install skycalc_cli's dependency, i.e. the requests package for
-        making HTTP calls.
-        
-        =============
-        Documentation
-        =============
-        
-        Documentation can be found on the `ESO SkyCalc Web Page <https://www.eso.org/observing/etc/doc/skycalc/helpskycalccli.html>`_.
-        
-Keywords: sky model observatory telescope astronomy ephemeris sun moon
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4

skycalc_cli-1.3/skycalc_cli.egg-info/PKG-INFO

@@ -1,43 +0,0 @@
-Metadata-Version: 1.2
-Name: skycalc-cli
-Version: 1.3
-Summary: ESO SkyCalc Command Line Interface
-Home-page: http://www.eso.org/observing/etc/bin/gen/form?INS.MODE=swspectr+INS.NAME=SKYCALC
-Author: European Southern Observatory
-Author-email: usd-help@eso.org
-License: MIT
-Description-Content-Type: UNKNOWN
-Description: ######################################
-         SkyCalc Command Line Interface (CLI)
-        ######################################
-        
-        ============
-        Installation
-        ============
-        
-        The SkyCalc CLI works in Python 2.7 or Python3. Install the SkyCalc CLI
-        on your computer using the command: ::
-        
-            pip install --user skycalc_cli
-        
-        This will also install skycalc_cli's dependency, i.e. the requests package for
-        making HTTP calls.
-        
-        =============
-        Documentation
-        =============
-        
-        Documentation can be found on the `ESO SkyCalc Web Page <https://www.eso.org/observing/etc/doc/skycalc/helpskycalccli.html>`_.
-        
-Keywords: sky model observatory telescope astronomy ephemeris sun moon
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4

skycalc_cli-1.3/skycalc_cli.egg-info/requires.txt

@@ -1,2 +0,0 @@
-requests
-setuptools