a2p2 0.7.2__tar.gz → 0.7.4__tar.gz

{a2p2-0.7.2/a2p2.egg-info → a2p2-0.7.4}/PKG-INFO

@@ -1,19 +1,27 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.2
-Summary: UNKNOWN
-Home-page: http://www.jmmc.fr/a2p2
-Author: JMMC Tech Group
-Author-email: jmmc-tech-group@jmmc.fr
+Version: 0.7.4
+Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
-Keywords: observation preparation tool optical-interferometry p2 samp
-Platform: UNKNOWN
+Project-URL: Homepage, https://www.jmmc.fr/a2p2
+Project-URL: Bug Reports, https://github.com/JMMC-OpenDev/a2p2/issues
+Project-URL: Source, https://github.com/JMMC-OpenDev/a2p2
+Keywords: observation,optical-interferometry,p2,preparation,samp,tool
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: appdirs
+Requires-Dist: astropy>=5.2.2
+Requires-Dist: p2api
+
+a2p2 |A2P2Badge|
+================
+
+**Move your Aspro2 observation details to an observatory proposal database.**
 
 Description
 -----------
@@ -80,6 +88,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------
@@ -110,5 +121,3 @@ Interaction diagram
 .. _a2p2:      http://www.jmmc.fr/a2p2
 .. _tutorial:  https://github.com/JMMC-OpenDev/a2p2/wiki/ASPRO2-A2P2-Tutorial
 .. _issue:     https://github.com/JMMC-OpenDev/a2p2/issues
-
-

{a2p2-0.7.2 → a2p2-0.7.4}/README.rst

@@ -68,6 +68,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------

a2p2-0.7.4/a2p2/chara/facility.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+
+__all__ = []
+
+from a2p2.chara.gui import CharaUI
+from a2p2.facility import Facility
+import requests
+import logging
+import traceback
+
+HELPTEXT = "TODO update this HELP message in a2p2/chara/facility.py"
+
+logger = logging.getLogger(__name__)
+
+class CharaFacility(Facility):
+
+    def __init__(self, a2p2client):
+        Facility.__init__(self, a2p2client, "CHARA", HELPTEXT)
+        self.charaUI = CharaUI(self)
+        self.connected2OB2 = False
+        self.validQueueServer = None
+
+    def processOB(self, ob):
+        if not ob:
+            return
+
+        self.a2p2client.ui.addToLog(
+            "OB received for '" + self.facilityName + "' interferometer")
+        # show ob dict for debug
+        self.a2p2client.ui.addToLog(str(ob), False)
+
+        # performs operation
+        self.consumeOB(ob)
+
+        # give focus on last updated UI
+        self.a2p2client.ui.showFacilityUI(self.charaUI)
+
+    def checkServer(self):
+        if self.validQueueServer:
+            # recheck ?
+            return True
+        else:
+            # search and test servers from preferences
+            queueServers=self.a2p2client.preferences.getCharaQueueServer()
+            msg=""
+            if queueServers :
+                for queueServer in queueServers:
+                    logger.debug(f'Trying to send OB on queuserver : {queueServer}')
+                    try:
+                        c=requests.get(queueServer, timeout=3)
+                        msg+=f"Connection succeeded on OB server : {c.json()}\n"
+                        self.validQueueServer = queueServer
+                        break
+                    except:
+                        msg+=f"Connection failed on {queueServer}\n"
+
+            self.a2p2client.ui.addToLog(msg)
+            self.charaUI.display(msg)
+
+            return self.validQueueServer
+
+    def consumeOB(self, ob):
+        if self.checkServer():
+            try:
+                r = requests.post(self.validQueueServer, json=ob.as_dict(), timeout=3)
+                msg = ""
+                msg+=f"OB sent to remote server queue : {r}"
+                self.connected2OB2 = True
+                self.a2p2client.ui.addToLog(msg)
+                self.charaUI.display(msg)
+            except:
+                print(traceback.format_exc())
+                msg=f"Can't send OB to the '{self.validQueueServer}' queue server, please relaunch it or try again for a new one."
+                self.validQueueServer = None
+                self.a2p2client.ui.addToLog(msg)
+                self.charaUI.display(msg)
+        else:
+            msg=f"Can't find any queue server, please launch it, edit your preferences or check your ssh port forwarding"
+
+        # display OB
+        self.charaUI.displayOB(ob)
+
+

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2/version.py

@@ -1,29 +1,39 @@
-__version__ = "0.7.2"
+__version__ = "0.7.4"
 
 __release_notes__ = {
     # "0.1.6": {
-    #    "STATUS":[
-    #             "This version get lot of changes and may contain bugs or missing features, please provide any feedback to improve and prepare a better future release !"
-    #         ],
     #    "A2P2": [
-    #
     #        ],
     #    "VLTI": [
-    #
     #        ],
     #    "CHARA": [
-    #
-    #        ],
-    #    "TODO-SCIENCE": [
-    #
-    #        ],
-    #    "TODO-DEV": [
-    #
     #        ],
     #    },
-    "0.7.2": {
-       "STATUS": [
+#
+#       "TODO-SCIENCE": [
+#           "Merge AO or GS in a same code section for every instruments",
+#          "Check DIT table from the last template user manuals (especially MATISSE) and remove PIONIER's one",
+#           "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values?",
+#       ],
+#       "TODO-DEV": [
+#           "Support multiple period version (two major at least)",
+#           "Support numlist keyword : eg. SEQ.HWPOFF (done in conf but must be range check compatible)",
+#          "Unify ob name creation in vlti instrument createOB()",
+#          "Complete test suite with more real p2 submissions",
+#          "Try to read OB in P2 and send them back to Aspro2 as a new obs",
+#      ],
+
+    "0.7.4": {
+       "A2P2": [
+           "Use pyproject.toml for python installation",
+        ],"VLTI": [
+            "Do not switch PIONIER mode to FREE when the magnitude of the IAS star is too high : an error may be provided by p2"
+        ],
+    },"0.7.3": {
+       "CHARA": [
+            "Better reuse of last working queueserver"
        ],
+    },"0.7.2": {
        "A2P2": [
            "Auto update chara queueserver preference",
            "a2p2 -r generates release-notes.md (rendered on a2p2 repository)"
@@ -34,21 +44,7 @@ __release_notes__ = {
        "CHARA": [
             "Support and try every queueserver's Urls comma separated from the queuserver user preference"
        ],
-       "TODO-SCIENCE": [
-           "Merge AO or GS in a same code section for every instruments",
-           "Check DIT table from the last template user manuals (especially MATISSE) and remove PIONIER's one",
-           "flag ~important~ keywords which MUST be set in a2p2 code and not leaved to there default values?",
-       ],
-       "TODO-DEV": [
-           "Support multiple period version (two major at least)",
-           "Support numlist keyword : eg. SEQ.HWPOFF (done in conf but must be range check compatible)",
-           "Unify ob name creation in vlti instrument createOB()",
-           "Complete test suite with more real p2 submissions",
-           "Try to read OB in P2 and send them back to Aspro2 as a new obs",
-       ],
     },"0.7.1": {
-       "STATUS": [
-       ],
        "A2P2": [
            "Fix ttk import on MacOS",
        ],
@@ -61,8 +57,6 @@ __release_notes__ = {
             "Display log of received OB also for calibrators"
        ]
     },"0.6.9": {
-       "STATUS": [
-       ],
        "A2P2": [
             "ctrl-c support improved to qui a2p2 from terminal",
        ],
@@ -90,8 +84,6 @@ __release_notes__ = {
             "Experimental: forward OBs through json payload to the location defined in preference",
         ],
     },"0.6.4": {
-        "STATUS": [
-        ],
         "A2P2": [
             "Fix import that may break run on windows..."
         ],
@@ -234,7 +226,7 @@ __release_notes__ = {
         ],
     },
     "0.2.14": {
-        "STATUS": [
+        "A2P2": [
             "BugFix: ask for container Name only if one is selected"
         ],
     },

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2/vlti/facility.py

@@ -191,10 +191,17 @@ class VltiFacility(Facility):
             instrument = self.getInstrument(o.instrumentConfiguration.name)
             instrument.checkOB(o)
             # check for warnings and abort if requested by user
+            # this implementation should be more detailled so we can have various VERSION associated to various warning
             if len(instrument.warnings)>0:
                 linesep="\n  -  "
-                version=instrument.getDitTable()["VERSION"]
-                answer = self.ui.AskYesNoMessage(f"According to the template manual {version} :\n \n  -  {linesep.join(instrument.warnings)}\n\nClick \"Yes\" to proceed \"No\" to abort the submission")
+                header=""
+                try:
+                    # some ditTable may have a VERSION entry some not...
+                    version=instrument.getDitTable()["VERSION"]
+                    header= f"According to the template manual {version} :\n \n  - \n"
+                except:
+                    pass
+                answer = self.ui.AskYesNoMessage(f"{header} {linesep.join(instrument.warnings)}\n\nClick \"Yes\" to proceed \"No\" to abort the submission")
                 instrument.warnings.clear()
                 if answer == False:
                     self.ui.addToLog("Submission has been marked to be aborted - do not proceed")

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2/vlti/pionier.py

@@ -124,9 +124,6 @@ class Pionier(VltiInstrument):
             else:
                 obConstraints.skyTransparency = 'Clear'
 
-            if acqTSF.ISS_IAS_HMAG > 7.5:
-                acqTSF.INS_DISP_NAME = "FREE"
-
             # FIXME: error (OB): "Phase 2 constraints must closely follow what was requested in the Phase 1 proposal.
             # The seeing value allowed for this OB is >= java0x0 arcsec."
             # FIXME REPLACE SEEING THAT IS NO MORE SUPPORTED

{a2p2-0.7.2 → a2p2-0.7.4/a2p2.egg-info}/PKG-INFO

@@ -1,19 +1,27 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.7.2
-Summary: UNKNOWN
-Home-page: http://www.jmmc.fr/a2p2
-Author: JMMC Tech Group
-Author-email: jmmc-tech-group@jmmc.fr
+Version: 0.7.4
+Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
-Keywords: observation preparation tool optical-interferometry p2 samp
-Platform: UNKNOWN
+Project-URL: Homepage, https://www.jmmc.fr/a2p2
+Project-URL: Bug Reports, https://github.com/JMMC-OpenDev/a2p2/issues
+Project-URL: Source, https://github.com/JMMC-OpenDev/a2p2
+Keywords: observation,optical-interferometry,p2,preparation,samp,tool
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: appdirs
+Requires-Dist: astropy>=5.2.2
+Requires-Dist: p2api
+
+a2p2 |A2P2Badge|
+================
+
+**Move your Aspro2 observation details to an observatory proposal database.**
 
 Description
 -----------
@@ -80,6 +88,9 @@ Each facilities get it's own code directory to manage specific GUI and specific
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------
@@ -110,5 +121,3 @@ Interaction diagram
 .. _a2p2:      http://www.jmmc.fr/a2p2
 .. _tutorial:  https://github.com/JMMC-OpenDev/a2p2/wiki/ASPRO2-A2P2-Tutorial
 .. _issue:     https://github.com/JMMC-OpenDev/a2p2/issues
-
-

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 MANIFEST.in
 README.rst
+pyproject.toml
 setup.cfg
 setup.py
 a2p2/__init__.py

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2.egg-info/entry_points.txt

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

a2p2-0.7.4/pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "a2p2"
+dynamic = ["version", "description"]
+#version = "1.2.3"
+#description = ["description"]
+readme = "README.rst"
+license = { "text" = "OSI Approved :: GNU General Public License v3 (GPLv3)" }
+requires-python = ">=3"
+authors = [
+    { name = "JMMC Tech Group", email = "jmmc-tech-group@jmmc.fr" },
+]
+keywords = [
+    "observation",
+    "optical-interferometry",
+    "p2",
+    "preparation",
+    "samp",
+    "tool",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.6",
+]
+dependencies = [
+    "appdirs",
+    "astropy>=5.2.2",
+    "p2api",
+]
+
+[project.scripts]
+a2p2 = "a2p2.__main__:main"
+
+[project.urls]
+Homepage = "https://www.jmmc.fr/a2p2"
+"Bug Reports" = "https://github.com/JMMC-OpenDev/a2p2/issues"
+Source = "https://github.com/JMMC-OpenDev/a2p2"
+

a2p2-0.7.4/setup.py

@@ -0,0 +1,19 @@
+from setuptools import setup, find_packages
+
+with open('README.rst') as README:
+    long_description = README.read()
+    description = long_description[
+        :long_description.index('Description')].split("*")[1].strip()
+
+versions = {}
+with open("a2p2/version.py") as fp:
+    exec(fp.read(), versions)
+
+setup(
+    version=versions['__version__'],
+    description=description
+# not yet moved to pyproject.toml
+#    packages=find_packages(),
+#    include_package_data=True,
+#    keywords='observation preparation tool optical-interferometry p2 samp'
+)

a2p2-0.7.2/a2p2/chara/facility.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-
-__all__ = []
-
-from a2p2.chara.gui import CharaUI
-from a2p2.facility import Facility
-import requests
-import logging
-import traceback
-
-HELPTEXT = "TODO update this HELP message in a2p2/chara/facility.py"
-
-logger = logging.getLogger(__name__)
-
-class CharaFacility(Facility):
-
-    def __init__(self, a2p2client):
-        Facility.__init__(self, a2p2client, "CHARA", HELPTEXT)
-        self.charaUI = CharaUI(self)
-        self.connected2OB2 = False
-
-    def processOB(self, ob):
-        if not ob:
-            return
-
-        self.a2p2client.ui.addToLog(
-            "OB received for '" + self.facilityName + "' interferometer")
-        # show ob dict for debug
-        self.a2p2client.ui.addToLog(str(ob), False)
-
-        # performs operation
-        self.consumeOB(ob)
-
-        # give focus on last updated UI
-        self.a2p2client.ui.showFacilityUI(self.charaUI)
-
-    def consumeOB(self, ob):
-        # forward message if a server is present in the preferences
-        queueServers=self.a2p2client.preferences.getCharaQueueServer()
-        if queueServers :
-            for queueServer in queueServers:
-                logger.debug(f'Trying to send OB on queuserver : {queueServer}')
-                try:
-                    if not self.connected2OB2:
-                        try:
-                            c=requests.get(queueServer, timeout=5)
-                            msg += f"Connection succeeded on OB2 server : {c.json()}\n"
-                        except:
-                            msg += f"Connection succeded on a non identified OB2 server\n"
-                    r = requests.post(queueServer, json=ob.as_dict(), timeout=5)
-                    msg = ""
-                    msg+=f"OB sent to remote server queue : {r}"
-                    self.connected2OB2 = True
-                    self.a2p2client.ui.addToLog(msg)
-                    self.charaUI.display(msg)
-                    break # do only send to the first server
-                except:
-                    print(traceback.format_exc())
-                    msg=f"Can't send OB to the '{queueServer}' queue server, please launch it, edit your preferences or check your ssh port forwarding "
-                    self.connected2OB2 = False
-                    self.a2p2client.ui.addToLog(msg)
-                    self.charaUI.display(msg)
-
-
-        # display OB
-        self.charaUI.displayOB(ob)
-
-

a2p2-0.7.2/setup.py

@@ -1,44 +0,0 @@
-from setuptools import setup, find_packages
-
-with open('README.rst') as README:
-    long_description = README.read()
-    description = long_description[
-        :long_description.index('Description')].split("*")[1].strip()
-    long_description = long_description[long_description.index('Description'):]
-
-version = {}
-with open("a2p2/version.py") as fp:
-    exec(fp.read(), version)
-
-setup(
-    name='a2p2',
-    version=version['__version__'],
-    python_requires='>=3',
-    description=description,
-    long_description=long_description,
-    #      install_requires=['astropy', 'p2api','pygtk'],
-    # PyGtk is not working on some linux
-    # anaconda also fails
-    # prefere the use of your default python packages on your linux
-    # what is the solution for mac ?
-    # we continue moving tk as first gui backend
-    # install_requires=['astropy', 'p2api', 'python-tk'] + (['pygtk'] if
-    # platform.startswith("win") else []),
-    install_requires=['astropy>=5.2.2', 'p2api', 'appdirs'],
-    url='http://www.jmmc.fr/a2p2',
-    author='JMMC Tech Group',
-    author_email='jmmc-tech-group@jmmc.fr',
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-#        'Programming Language :: Python :: 2',
-#        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-    ],
-    license='OSI Approved :: GNU General Public License v3 (GPLv3)',
-    packages=find_packages(),
-    include_package_data=True,
-    entry_points={'console_scripts': ['a2p2=a2p2.__main__:main']},
-    keywords='observation preparation tool optical-interferometry p2 samp'
-)

{a2p2-0.7.2 → a2p2-0.7.4}/a2p2.egg-info/requires.txt

@@ -1,3 +1,3 @@
+appdirs
 astropy>=5.2.2
 p2api
-appdirs