gpstime 0.8.2__py3-none-any.whl → 0.9.0__py3-none-any.whl

gpstime/__init__.py

@@ -23,6 +23,7 @@ from datetime import datetime
 import argparse
 import subprocess
 
+from dateutil.parser import parse as duparse
 from dateutil.tz import tzutc, tzlocal
 
 try:
@@ -81,32 +82,26 @@ def _cu_date_parse(string='now'):
 
     """
     cmd = ['date', '+%s.%N', '-d', string]
-    try:
-        ts = subprocess.check_output(cmd, stderr=subprocess.PIPE).strip()
-    except (FileNotFoundError, subprocess.CalledProcessError) as e:
-        raise GPSTimeException("could not parse string '{}'".format(string)) from e
-    return float(ts)
+    return float(subprocess.check_output(cmd, stderr=subprocess.PIPE).strip())
 
 
 def _du_date_parse(string='now'):
     """Parse date/time string to UNIX timestamp with dateutils parse
 
     """
-    from dateutil.parser import parse
-    try:
-        ts = parse(string).timestamp()
-    except Exception as e:
-        raise GPSTimeException("could not parse string '{}'".format(string)) from e
-    return float(ts)
+    return float(duparse(string).timestamp())
 
 
-# test which date string parser to use.  default to coreutils date if
-# available, since it has a better parser.
-try:
-    _cu_date_parse()
-    _date_parse = _cu_date_parse
-except GPSTimeException:
-    _date_parse = _du_date_parse
+def _date_parse(string="now"):
+    """Parse date/time string to UNIX timestamp"""
+    try:
+        ts = _du_date_parse(string)
+    except Exception:
+        try:
+            ts = _cu_date_parse(string)
+        except Exception:
+            raise GPSTimeException("could not parse string '{}'".format(string)) from None
+    return ts
 
 
 ##################################################
@@ -153,13 +148,23 @@ class gpstime(datetime):
         """Return gpstime object corresponding to GPS time."""
         return cls.fromtimestamp(gps2unix(gps), tz=tzutc())
 
+    @classmethod
+    def fromgpsns(cls, gps):
+        """Return gpstime object corresponding to GPS time in nanoseconds."""
+        try:
+            gps = int(gps)
+        except ValueError:
+            raise GPSTimeException("Provided value is not an integer")
+        gps /= 1_000_000_000
+        return cls.fromgps(gps)
+
     @classmethod
     def parse(cls, string='now'):
-        """Parse an arbitrary time string into a gpstime object.
+        """Parse an arbitrary time string/float into a gpstime object.
 
         If string not specified 'now' is assumed.  Strings that can be
-        cast to float are assumed to be GPS times.  Prepend '@' to a
-        float to specify a UNIX timestamp.
+        cast to a float are assumed to be GPS times.  Prepend '@' to a
+        float string to specify a UNIX timestamp.
 
         This parse uses the natural lanuage parsing abilities of the
         GNU coreutils 'date' utility.  See "DATE STRING" in date(1)
@@ -216,7 +221,7 @@ def gpsnow():
     """Return current GPS time as a float.
 
     """
-    return gpstime.utcnow().replace(tzinfo=tzutc()).gps()
+    return unix2gps(datetime.now(tz=tzutc()).timestamp())
 
 
 parse = gpstime.parse
@@ -233,8 +238,14 @@ class GPSTimeParseAction(argparse.Action):
         # single string
         if isinstance(values, list):
             values = ' '.join(values)
-        try:
-            gps = parse(values)
-        except GPSTimeException:
-            parser.error("Could not parse date/time string '{}'".format(values))
+        if namespace.nano:
+            try:
+                gps = gpstime.fromgpsns(values)
+            except GPSTimeException as e:
+                parser.error(e)
+        else:
+            try:
+                gps = parse(values)
+            except GPSTimeException:
+                parser.error("Could not parse date/time string '{}'".format(values))
         setattr(namespace, self.dest, gps)

gpstime/__main__.py

@@ -17,17 +17,24 @@ https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
     formatter_class=argparse.RawDescriptionHelpFormatter)
 PARSER.add_argument(
     '-v', '--version', action='version', version=__version__,
-    help="print version number and exit")
+    help="show version number and exit")
+# parser options
+pg = PARSER.add_mutually_exclusive_group()
+pg.add_argument(
+    '-n', '--nano', action='store_true',
+    help="assume time specified as integer GPS nanoseconds")
+# output options
 zg = PARSER.add_mutually_exclusive_group()
 zg.add_argument(
     '-l', '--local', action='store_const', dest='tz', const='local',
-    help="print only local time")
+    help="print only local time (or timezone specified with 'TZ' env var)")
 zg.add_argument(
     '-u', '--utc', action='store_const', dest='tz', const='utc',
     help="print only UTC time")
 zg.add_argument(
     '-g', '--gps', action='store_const', dest='tz', const='gps',
     help="print only GPS time")
+# format options
 fg = PARSER.add_mutually_exclusive_group()
 fg.add_argument(
     '-i', '--iso', action='store_const', dest='format', const=ISO_FORMAT,

gpstime/__version__.py

@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.9.0'
+__version_tuple__ = version_tuple = (0, 9, 0)
 
-__version__ = version = '0.8.2'
-__version_tuple__ = version_tuple = (0, 8, 2)
+__commit_id__ = commit_id = 'gbfcac2c49'

gpstime/leaps.py

@@ -6,10 +6,11 @@ import warnings
 from tempfile import NamedTemporaryFile
 from functools import lru_cache
 
-import appdirs
-
-
-CACHE_DIR = appdirs.user_cache_dir('gpstime')
+try:
+    from platformdirs import user_cache_dir
+except ImportError:
+    from appdirs import user_cache_dir
+CACHE_DIR = user_cache_dir('gpstime')
 
 LEAP_FILES = [
     '/usr/share/zoneinfo/leap-seconds.list',
@@ -235,8 +236,7 @@ def find_leap_data(download=None):
                 return leapdata
 
     if download is not False:
-        if not os.path.exists(CACHE_DIR):
-            os.makedirs(CACHE_DIR)
+        os.makedirs(CACHE_DIR, exist_ok=True)
 
         for remote in SOURCES:
             print(f"Attempting to update user leap data cache from {remote}...", file=sys.stderr)
@@ -261,8 +261,6 @@ def find_leap_data(download=None):
                 os.remove(temp_path)
                 continue
 
-            if os.path.exists(path):
-                os.remove(path)
             os.rename(temp_path, path)
 
             if leapdata.valid:

gpstime/test.py

@@ -1,6 +1,7 @@
+import datetime
 import unittest
+import shutil
 import sys
-import datetime
 
 from dateutil.tz import tzutc
 
@@ -10,11 +11,9 @@ import gpstime
 
 def cu_date_available():
     """return True if coreutils date parser available"""
-    try:
-        gpstime._cu_date_parse()
+    if shutil.which("date"):
         return True
-    except:
-        return False
+    return False
 
 
 class TestGPStime(unittest.TestCase):
@@ -131,10 +130,29 @@ class TestGPStime(unittest.TestCase):
         self.assertEqual(gpstime.gpstime.fromgps(1133585676.874).iso(),
                          '2015-12-08T04:54:19.874000Z')
 
+    @unittest.skipIf(not cu_date_available(), "coreutils date not available")
+    def test_non_standard_iso_format(self):
+        """ Tests whether dates with '/' separators are parsed as iso dates.
+        Core utils instead parses them as if the 'T' character meant
+        a military time zone.
+        """
+
+        # both date utils and core utils will parse this using the default timezone
+        self.assertEqual(gpstime.gpstime.parse('2025-02-08T04:54:19'),
+
+        # date utils will also parse this using the default time zone
+        # but core utils will parse this using the military timezone 'T'
+                         gpstime.gpstime.parse('2025/02/08T04:54:19'))
+
+
     def test_gpstime_fromgps_timestamp(self):
         self.assertEqual(gpstime.gpstime.fromgps(1133585676).timestamp(),
                          1449550459)
 
+    def test_gpstime_fromgpsns_timestamp(self):
+        self.assertEqual(gpstime.gpstime.fromgpsns(1133585676200000000).gps(),
+                         1133585676.2)
+
     def test_gpstime_tconvert_classmethod(self):
         self.assertEqual(gpstime.gpstime.tconvert(1133585676.2).gps(),
                          1133585676.2)

{gpstime-0.8.2.dist-info → gpstime-0.9.0.dist-info}/METADATA

@@ -1,26 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: gpstime
-Version: 0.8.2
+Version: 0.9.0
 Summary: GPS-aware datetime module
-Home-page: https://git.ligo.org/cds/gpstime
-Author: Jameson Graef Rollins
-Author-email: jameson.rollins@ligo.org
-License: GPL-3.0-or-later
+Author-email: Jameson Graef Rollins <jameson.rollins@ligo.org>
+License-Expression: GPL-3.0-or-later
+Project-URL: Homepage, https://git.ligo.org/cds/software/gpstime
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: COPYING-GPL-3
-Requires-Dist: appdirs
+Requires-Dist: platformdirs; python_version >= "3.10"
+Requires-Dist: appdirs; python_version < "3.10"
 Requires-Dist: python-dateutil
 Requires-Dist: requests
+Dynamic: license-file
 
 GPS-aware datetime module
 =========================

gpstime-0.9.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+gpstime/__init__.py,sha256=fre95_2UeDNSeb3kS3JebJOh9Bn30iLVZQh-Juch_AI,7284
+gpstime/__main__.py,sha256=ndEEI2WAOkZzQrwQ7zJs0nbTsMTpIutGyoZR_Tr6DYE,2882
+gpstime/__version__.py,sha256=Zco1Vyuo5sw4puW8I8qiB87z9_37yhdD3y1klzVfvHg,712
+gpstime/leaps.py,sha256=QduewuPZce_BpbB5zkMR4c_sZeATn1oD7XuPIECRpOQ,7825
+gpstime/test.py,sha256=0NZVr46dAuxn1gYUMJtU89z0Kd5bn8S7lJAUzPujbns,7845
+gpstime-0.9.0.data/scripts/gpstime,sha256=R2M1Xg02MAqpiPWxuOoSYr3S8zk7aPtfeHBmMG-1jMo,183
+gpstime-0.9.0.dist-info/licenses/COPYING,sha256=kD3Y57xS042kgHR4KTOzNOiOHLxiOtxwe2gomX6l0cM,1724
+gpstime-0.9.0.dist-info/licenses/COPYING-GPL-3,sha256=_ILKi2_bGNTj6Fz9irWNG80_Gymr54KJWr2R1kdj-Oc,35068
+gpstime-0.9.0.dist-info/METADATA,sha256=L2SBzlWvNP6GRjB_qC8EQPOTzVJo-ZwMeWZGJ59uoNE,1477
+gpstime-0.9.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gpstime-0.9.0.dist-info/top_level.txt,sha256=LJlZJoesrJMc-u-T2IuSXd6udNzp1TaVD6aJa5Zwj54,8
+gpstime-0.9.0.dist-info/RECORD,,

{gpstime-0.8.2.dist-info → gpstime-0.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

gpstime-0.8.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-gpstime/__init__.py,sha256=mvvNkbLXi2Ego2INs97qUZz4vmmuo5WZ55IlYiOhwIc,6950
-gpstime/__main__.py,sha256=_sCWDDruEWZOrkorMeQkOwIVcWAOfzA5VSuTpuG3iNs,2628
-gpstime/__version__.py,sha256=t6tJJG56wlBKsg_0M1Q4l1ir09jgXRw1tolMbDalW9g,411
-gpstime/leaps.py,sha256=yc8rjaF8fqvrL1ytNffj2PbibyW-J0BPpmI7oOPJn4I,7842
-gpstime/test.py,sha256=74rbEBOnQIEhE96VPiTZqekbwRoumeNqgj3rXHILGpw,7010
-gpstime-0.8.2.data/scripts/gpstime,sha256=R2M1Xg02MAqpiPWxuOoSYr3S8zk7aPtfeHBmMG-1jMo,183
-gpstime-0.8.2.dist-info/COPYING,sha256=kD3Y57xS042kgHR4KTOzNOiOHLxiOtxwe2gomX6l0cM,1724
-gpstime-0.8.2.dist-info/COPYING-GPL-3,sha256=_ILKi2_bGNTj6Fz9irWNG80_Gymr54KJWr2R1kdj-Oc,35068
-gpstime-0.8.2.dist-info/METADATA,sha256=9gLonvhIzkqc5GRV98P9Q62fCiwLXwQbHGGdXXlAOfI,1566
-gpstime-0.8.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-gpstime-0.8.2.dist-info/top_level.txt,sha256=LJlZJoesrJMc-u-T2IuSXd6udNzp1TaVD6aJa5Zwj54,8
-gpstime-0.8.2.dist-info/RECORD,,