gkutils 0.3.0__tar.gz → 0.3.2__tar.gz

{gkutils-0.3.0 → gkutils-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gkutils
-Version: 0.3.0
+Version: 0.3.2
 Summary: A collection useful utilities - mostly related to astronomy
 Home-page: https://github.com/genghisken/gkutils
 Author: genghisken

gkutils-0.3.2/gkutils/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.3.2'

{gkutils-0.3.0 → gkutils-0.3.2}/gkutils/commonutils/generalutils.py

@@ -989,7 +989,7 @@ def coneSearch(ra, dec, radius, tableName, htmLevel = 16, queryType = QUICK, con
    return message, results
 
 # TODO We have the opportunity to inject another where clause component.
-def coneSearchHTMWithExtraWhereClause(ra, dec, radius, tableName, htmLevel = 16, queryType = QUICK, conn = None, django = False, prefix = "htm", suffix = "ID", extraWhereClause = None):
+def coneSearchHTMWithExtraWhereClause(ra, dec, radius, tableName, htmLevel = 16, queryType = QUICK, conn = None, django = False, prefix = "htm", suffix = "ID", extraWhereClause = ''):
    """HTM only cone search.  Assumes a column in the catalogue which by default is called htm<n>ID where <n> is the HTM level.
 
    Args:
@@ -2810,14 +2810,16 @@ COORDS_DEC_REGEX = ""
 #COORDS_SEX_REGEX = "^([0-2][0-9])[^0-9]{0,1}([0-5][0-9])[^0-9]{0,1}([0-5][0-9])(\.[0-9]+){0,1}[^0-9+\-]{0,5}([+-]){0,1}([0-9][0-9])[^0-9]{0,1}([0-5][0-9])[^0-9]{0,1}([0-5][0-9])(\.[0-9]+){0,1}[^0-9 ]{0,1}( +([0-9][0-9]{0,1})){0,1}"
 
 # 2019-04-17 KWS Made the sexagesimal regex a bit more forgiving.
+# 2024-04-10 KWS Allow up to 3 digits + fraction for the search radius.
 #                                h    h               m    m                       s    s     .  f                       (+-)              d    d                    m    m               s    s     .  f                        (radius)
-COORDS_SEX_REGEX = "^([0-2]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])(\.[0-9]+){0,1}[^0-9+\-\.]{0,}([+-]){0,1}([0-9]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])(\.[0-9]+){0,1}[^0-9+\-\.]{0,}(([0-9][0-9]{0,1})){0,1}$"
+COORDS_SEX_REGEX = "^([0-2]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])(\.[0-9]+){0,1}[^0-9+\-\.]{0,}([+-]){0,1}([0-9]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])[^0-9+\-\.]{0,}([0-5]{0,1}[0-9])(\.[0-9]+){0,1}[^0-9+\-\.]{0,}(([0-9][0-9]{0,2}(\.[0-9]+){0,1})){0,1}$"
 COORDS_SEX_REGEX_COMPILED = re.compile(COORDS_SEX_REGEX)
 
 #COORDS_DEC_REGEX = "^([0-9]+(\.[0-9]+){0,1})[^0-9+\-]{0,5}([+-]{0,1}[0-9]+(\.[0-9]+){0,1})[^0-9 ]{0,1}( +([0-9][0-9]{0,1})){0,1}"
 # 2019-04-17 KWS Made the decimal regex a bit more forgiving.
+# 2024-04-10 KWS Allow up to 3 digits + fraction for the search radius.
 #                            d.f                           (+-)            d.f                         (radius)
-COORDS_DEC_REGEX = "^([0-9]+(\.[0-9]+){0,1})[^0-9+\-]{0,}([+-]{0,1}[0-9]+(\.[0-9]+){0,1})[^0-9]{0,}(([0-9][0-9]{0,1})){0,1}$"
+COORDS_DEC_REGEX = "^([0-9]+(\.[0-9]+){0,1})[^0-9+\-]{0,}([+-]{0,1}[0-9]+(\.[0-9]+){0,1})[^0-9]{0,}(([0-9][0-9]{0,2}(\.[0-9]+){0,1})){0,1}$"
 COORDS_DEC_REGEX_COMPILED = re.compile(COORDS_DEC_REGEX)
 
 # 2019-04-17 KWS Made the name search more forgiving and extended it to ZTF.

{gkutils-0.3.0 → gkutils-0.3.2}/gkutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gkutils
-Version: 0.3.0
+Version: 0.3.2
 Summary: A collection useful utilities - mostly related to astronomy
 Home-page: https://github.com/genghisken/gkutils
 Author: genghisken

gkutils-0.3.0/gkutils/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.3.0'