v2.8.0 - add rnx2crx and crx2rnx to PATH

Author: valgur

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 See also [CHANGES.md](rnxcmp/docs/CHANGES.md) of the original RNXCMP software package.
 
+## [2.8.0] - 2022-01-27
+
+- `rnx2crx` and `crx2rnx` executables are now added to the PATH.
+
 ## [2.7.0] - 2022-01-27
 
 - Updated RNXCMP to version 4.1.0:
@@ -63,6 +67,7 @@ First release.
 - Provide Hatanaka decompression / compression support via `crx2rnx` and `rnx2crx` functions.
 - Install `crx2rnx` and `rnx2crx` as command line executables.
 
+[2.8.0]: https://github.com/valgur/hatanaka/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/valgur/hatanaka/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/valgur/hatanaka/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/valgur/hatanaka/compare/v2.4.0...v2.5.0

README.md

@@ -70,6 +70,8 @@ rinex-compress 1lsu0010.21o
 rinex-decompress < 1lsu0010.21d.Z | grep 'SYS / # / OBS TYPES'
 ```
 
+Additionally, the original `rnx2crx` and `crx2rnx` executables are also installed for other tools that might want to make use of them, such as RTKLIB.
+
 ## Development
 
 ### Building from source

hatanaka/__init__.py

@@ -1,5 +1,5 @@
 from .general_compression import *
 from .hatanaka import *
 
-__version__ = '2.7.0'
+__version__ = '2.8.0'
 rnxcmp_version = '4.1.0'

hatanaka/cli.py

@@ -1,16 +1,18 @@
 import argparse
+import os
 import sys
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 from hatanaka import __version__, compress, compress_on_disk, decompress, decompress_on_disk, \
     rnxcmp_version
 from hatanaka.general_compression import _record_warnings
+from hatanaka.hatanaka import _popen
 
 __all__ = ['decompress_cli', 'compress_cli']
 
 
-def decompress_cli(args: Optional[List[str]] = None) -> int:
+def decompress_cli(args: List[str] = None) -> int:
     if args is None:
         args = sys.argv[1:]
 
@@ -37,7 +39,7 @@ def decompress_cli(args: Optional[List[str]] = None) -> int:
     return _run(decompress, decompress_on_disk, args, skip_strange_epochs=args.skip_strange_epochs)
 
 
-def compress_cli(args: Optional[List[str]] = None) -> int:
+def compress_cli(args: List[str] = None) -> int:
     if args is None:
         args = sys.argv[1:]
 
@@ -106,3 +108,23 @@ def _add_common_args(parser):
                              'finishes without any errors and warnings')
     parser.add_argument('--version', action='version', version=__version__)
     parser.add_argument('--rnxcmp-version', action='version', version=rnxcmp_version)
+
+
+def _wrap(program, args):
+    try:
+        if args is None:
+            args = sys.argv[1:]
+        proc = _popen(program, args)
+        proc.wait()
+        return proc.returncode
+    except KeyboardInterrupt:
+        sys.stderr = open(os.devnull, 'w')
+        raise
+
+
+def rnx2crx(args: List[str] = None):
+    return _wrap('rnx2crx', args)
+
+
+def crx2rnx(args: List[str] = None):
+    return _wrap('crx2rnx', args)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = hatanaka
-version = 2.7.0
+version = 2.8.0
 author = Martin Valgur
 author_email = [email protected]
 url = https://github.com/valgur/hatanaka
@@ -13,7 +13,6 @@ keywords =
     Hatanaka compression
     GNSS
 classifiers =
-    Development Status :: 4 - Beta
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
     Programming Language :: Python :: 3
@@ -42,3 +41,5 @@ hatanaka.test.data = *
 console_scripts =
     rinex-decompress = hatanaka.cli:decompress_cli
     rinex-compress = hatanaka.cli:compress_cli
+    rnx2crx = hatanaka.cli:rnx2crx
+    crx2rnx = hatanaka.cli:crx2rnx