PyPI - pygnssutils - Versions diffs - 1.2.6__tar.gz → 1.2.8__tar.gz - Mend

pygnssutils 1.2.6tar.gz → 1.2.8tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

{pygnssutils-1.2.6/src/pygnssutils.egg-info → pygnssutils-1.2.8}/PKG-INFO RENAMED Viewed

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: pygnssutils
-Version: 1.2.6
+Version: 1.2.8
 Summary: GNSS Command Line Utilities
-Author-email: Steve Smith <semuadmin@semuconsulting.com>
-Maintainer-email: Steve Smith <semuadmin@semuconsulting.com>
+Author: Steve Smith
+Author-email: semuadmin@semuconsulting.com
+Maintainer: Steve Smith
+Maintainer-email: semuadmin@semuconsulting.com
 License-Expression: BSD-3-Clause
 Project-URL: homepage, https://github.com/semuconsulting/pygnssutils
 Project-URL: documentation, https://www.semuconsulting.com/pygnssutils/
@@ -24,21 +26,22 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi>=2025.0.0
-Requires-Dist: paho-mqtt>=2.1.0
+Requires-Dist: certifi>=2026.0.0
+Requires-Dist: pynmeagps>=1.1.7
+Requires-Dist: pyqgc>=1.0.0
+Requires-Dist: pyrtcm>=1.2.0
+Requires-Dist: pysbf2>=1.0.4
 Requires-Dist: pyserial>=3.5
 Requires-Dist: pyspartn>=1.0.8
-Requires-Dist: pyubx2>=1.3.6
-Requires-Dist: pynmeagps>=1.1.5
-Requires-Dist: pysbf2>=1.0.4
+Requires-Dist: pyubx2>=1.3.7
 Requires-Dist: pyubxutils>=1.0.6
-Requires-Dist: pyqgc>=1.0.0
 Requires-Dist: pyunigps>=1.0.0
 Dynamic: license-file
@@ -51,7 +54,6 @@ pygnssutils
 [gnssstreamer CLI](#gnssstreamer) |
 [gnssserver CLI](#gnssserver) |
 [gnssntripclient CLI](#gnssntripclient) |
-[gnssmqttclient CLI](#gnssmqttclient) |
 [socketserver](#socketserver) |
 [RINEX Conversion](#rinexconvert) |
 [RTK Demonstration](#rtkdemo) |
@@ -71,17 +73,14 @@ pygnssutils is an original series of Python GNSS utility classes and CLI tools b
 Originally developed in support of the [PyGPSClient](https://github.com/semuconsulting/PyGPSClient) GUI GNSS application, the utilities provided by pygnssutils can also be used in their own right:
-1. `GNSSReader` class. This is essentially an amalgamation of the `*Reader` classes in all the subsidiary parsers listed above, allowing the user to seamlessly stream any of NMEA, UBX, SBF, UNI, QGC, RTCM3 and SPARTN message protocols concurrently from a single stream.
+1. `GNSSReader` class. This is essentially an amalgamation of the `*Reader` classes in all the subsidiary parsers listed above, allowing the user to seamlessly stream any of NMEA, UBX, SBF, UNI, QGC and RTCM3 message protocols concurrently from a single stream.
 1. `GNSSStreamer` class and its associated [`gnssstreamer`](#gnssstreamer) (*formerly `gnssdump`*) CLI utility. This is essentially a configurable bidirectional input/output wrapper around the `GNSSReader` class with flexible message formatting, filtering and output handling options for NMEA, UBX, SBF, UNI, QGC and RTCM3 protocols.
 1. `GNSSSocketServer` class and its associated [`gnssserver`](#gnssserver) CLI utility. This implements a TCP Socket Server for GNSS data streams which is also capable of being run as a simple NTRIP Server/Caster.
 1. `GNSSNTRIPClient` class and its associated [`gnssntripclient`](#gnssntripclient) CLI utility. This implements
 a simple NTRIP Client which receives RTCM3 or SPARTN correction data from an NTRIP Server and (optionally) sends this to a
 designated output stream.
-1. `GNSSMQTTClient` class and its associated [`gnssmqttclient`](#gnssmqttclient) CLI utility. This implements
-a simple SPARTN IP (MQTT) Client which receives SPARTN correction data from an SPARTN IP location service and (optionally) sends this to a
-designated output stream.
 1. `SocketServer` class based on the native Python `ThreadingTCPServer`. Capable of operating in two modes - Socket Server or NTRIP Caster. Provides two alternate client request handler classes - `ClientHandler` (HTTP) or `ClientHandlerTLS` (HTTPS).
-1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental work in progress (*contributions and feedback welcome*)**
+1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental feature (*contributions and feedback welcome*)**
 The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnssutils](https://github.com/semuconsulting/pygnssutils).
@@ -97,18 +96,18 @@ The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnss
 Sphinx API Documentation in HTML format is available at [https://www.semuconsulting.com/pygnssutils](https://www.semuconsulting.com/pygnssutils).
-Contributions welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
+Contributions _**from human beings**_ welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
 [Bug reports](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) and [Feature requests](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - please use the templates provided. For general queries and advice, post a message to one of the [pygnssutils Discussions](https://github.com/semuconsulting/pygnssutils/discussions) channels.
-![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/master/images/nocopilot100.png?raw=true)
+![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/main/images/nocopilot100.png?raw=true)
 ---
 ## <a name="installation">Installation</a>
 ![Python version](https://img.shields.io/pypi/pyversions/pygnssutils.svg?style=flat)
 [![PyPI version](https://img.shields.io/pypi/v/pygnssutils.svg?style=flat)](https://pypi.org/project/pygnssutils/)
-[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/master/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
+[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/main/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
 `pygnssutils` is compatible with Python>=3.10.
@@ -182,7 +181,6 @@ class pygnssutils.gnssstreamer.GNSSStreamer(**kwargs)
    - 0 = none (default)
    - 1 = RTK NTRIP RTCM caster
    - 2 = RTK NTRIP SPARTN caster
-   - 3 = RTK MQTT SPARTN source (see [gnssmqttclient](#gnssmqttclient) for MQTT client configuration details)
    - 4 = serial port
    - 5 = binary file.
@@ -472,41 +470,6 @@ gnssntripclient -h
 Refer to the [Sphinx API documentation](https://www.semuconsulting.com/pygnssutils/pygnssutils.html#module-pygnssutils.gnssntripclient) for further details.
----
-## <a name="gnssmqttclient">GNSSMQTTClient and gnssmqttclient CLI</a>
-```
-class pygnssutils.gnssmqttclient.GNSSMQTTClient(app=None, **kwargs)
-```
-The `GNSSMQTTClient` class provides a basic SPARTN IP (MQTT) Client capability and forms the basis of a [`gnssmqttclient`](#gnssmqttclient) CLI utility. It receives RTK correction data from a SPARTN IP (MQTT) location service (e.g. the u-blox / Thingstream PointPerfect service) and (optionally) sends this to a designated output stream.
-### CLI Usage:
-The `clientid` provided by the location service may be set as environment variable `MQTTCLIENTID`. If this environment variable is set and the TLS certificate (\*.crt) and key (\*.pem) files provided by the location service are placed in the user's `HOME` directory, the utility can use these as default settings and may be invoked without any arguments.
-Assuming the Python 3 scripts (bin) directory is in your PATH, the CLI utility may be invoked from the shell thus (press CTRL-C to terminate):
-```shell
-gnssmqttclient --clientid yourclientid --server pp.services.u-blox.com --port 8883 --region eu --mode 0 --topic_ip 1 --topic_mga 1 --topic_key 1 --tlscrt '/Users/{your-user}/device-{your-clientid}-pp-cert.crt' --tlskey '/Users/{your-user}/device-{your-client-id}-pp-key.pem'} --spartndecode 0 --clioutput 0 --verbosity 2
-```
-```
-2024-08-15 09:14:50.544 - INFO - pygnssutils.gnssmqttclient - Starting MQTT client with arguments {'server': 'pp.services.u-blox.com', 'port': 8883, 'clientid': 'your-client-id', 'region': 'eu', 'mode': 0, 'topic_ip': 1, 'topic_mga': 1, 'topic_key': 1, 'tlscrt': '/Users/myuser/device-your-client-id-pp-cert.crt', 'tlskey': '/Users/myuser/device-your-client-id-pp-key.pem', 'spartndecode': 0, 'output': None}.
-2024-08-15 09:14:50.840 - INFO - pygnssutils.gnssmqttclient - RXM-SPARTN-KEY
-2024-08-15 09:14:50.854 - INFO - pygnssutils.gnssmqttclient - MGA-INI-TIME-UTC
-2024-08-15 09:14:50.858 - INFO - pygnssutils.gnssmqttclient - MGA-GPS-EPH
-...
-```
-Command line arguments can be stored in a configuration file and invoked using the `-C` or `--config` argument. The location of the configuration file can be set in environment variable `GNSSMQTTCLIENT_CONF`.
-For help and full list of optional arguments, type:
-```shell
-gnssmqttclient -h
-```
-Refer to the [pyspartn documentation](https://github.com/semuconsulting/pyspartn?tab=readme-ov-file#reading) for further details on decrypting encrypted (`eaf=1`) SPARTN payloads.
 ---
 ## <a name="socketserver">SocketServer</a>
@@ -671,6 +634,8 @@ semuadmin@semuconsulting.com
 ![License](https://img.shields.io/github/license/semuconsulting/pygnssutils.svg)
+[![ORCID iD icon](https://orcid.org/sites/default/files/images/orcid_16x16.png) https://orcid.org/0009-0002-5751-8719](https://orcid.org/0009-0002-5751-8719)
 `pygnssutils` is maintained entirely by unpaid volunteers. It receives no funding from advertising or corporate sponsorship. If you find the utility useful, please consider sponsoring the project with the price of a coffee...
 [![Sponsor](https://github.com/semuconsulting/pyubx2/blob/master/images/sponsor.png?raw=true)](https://buymeacoffee.com/semuconsulting)

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/README.md RENAMED Viewed

@@ -7,7 +7,6 @@ pygnssutils
 [gnssstreamer CLI](#gnssstreamer) |
 [gnssserver CLI](#gnssserver) |
 [gnssntripclient CLI](#gnssntripclient) |
-[gnssmqttclient CLI](#gnssmqttclient) |
 [socketserver](#socketserver) |
 [RINEX Conversion](#rinexconvert) |
 [RTK Demonstration](#rtkdemo) |
@@ -27,17 +26,14 @@ pygnssutils is an original series of Python GNSS utility classes and CLI tools b
 Originally developed in support of the [PyGPSClient](https://github.com/semuconsulting/PyGPSClient) GUI GNSS application, the utilities provided by pygnssutils can also be used in their own right:
-1. `GNSSReader` class. This is essentially an amalgamation of the `*Reader` classes in all the subsidiary parsers listed above, allowing the user to seamlessly stream any of NMEA, UBX, SBF, UNI, QGC, RTCM3 and SPARTN message protocols concurrently from a single stream.
+1. `GNSSReader` class. This is essentially an amalgamation of the `*Reader` classes in all the subsidiary parsers listed above, allowing the user to seamlessly stream any of NMEA, UBX, SBF, UNI, QGC and RTCM3 message protocols concurrently from a single stream.
 1. `GNSSStreamer` class and its associated [`gnssstreamer`](#gnssstreamer) (*formerly `gnssdump`*) CLI utility. This is essentially a configurable bidirectional input/output wrapper around the `GNSSReader` class with flexible message formatting, filtering and output handling options for NMEA, UBX, SBF, UNI, QGC and RTCM3 protocols.
 1. `GNSSSocketServer` class and its associated [`gnssserver`](#gnssserver) CLI utility. This implements a TCP Socket Server for GNSS data streams which is also capable of being run as a simple NTRIP Server/Caster.
 1. `GNSSNTRIPClient` class and its associated [`gnssntripclient`](#gnssntripclient) CLI utility. This implements
 a simple NTRIP Client which receives RTCM3 or SPARTN correction data from an NTRIP Server and (optionally) sends this to a
 designated output stream.
-1. `GNSSMQTTClient` class and its associated [`gnssmqttclient`](#gnssmqttclient) CLI utility. This implements
-a simple SPARTN IP (MQTT) Client which receives SPARTN correction data from an SPARTN IP location service and (optionally) sends this to a
-designated output stream.
 1. `SocketServer` class based on the native Python `ThreadingTCPServer`. Capable of operating in two modes - Socket Server or NTRIP Caster. Provides two alternate client request handler classes - `ClientHandler` (HTTP) or `ClientHandlerTLS` (HTTPS).
-1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental work in progress (*contributions and feedback welcome*)**
+1. `RinexConverter` class and its associated [`pyrinexconv`](#rinexconvert) CLI utility. This implements a binary GNSS data log file to RINEX text file conversion facility. **NB: RINEX conversion is currently an experimental feature (*contributions and feedback welcome*)**
 The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnssutils](https://github.com/semuconsulting/pygnssutils).
@@ -53,18 +49,18 @@ The pygnssutils homepage is located at [https://github.com/semuconsulting/pygnss
 Sphinx API Documentation in HTML format is available at [https://www.semuconsulting.com/pygnssutils](https://www.semuconsulting.com/pygnssutils).
-Contributions welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
+Contributions _**from human beings**_ welcome - please refer to [CONTRIBUTING.MD](https://github.com/semuconsulting/pygnssutils/blob/main/CONTRIBUTING.md).
 [Bug reports](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) and [Feature requests](https://github.com/semuconsulting/pygnssutils/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - please use the templates provided. For general queries and advice, post a message to one of the [pygnssutils Discussions](https://github.com/semuconsulting/pygnssutils/discussions) channels.
-![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/master/images/nocopilot100.png?raw=true)
+![No Copilot](https://github.com/semuconsulting/PyGPSClient/blob/main/images/nocopilot100.png?raw=true)
 ---
 ## <a name="installation">Installation</a>
 ![Python version](https://img.shields.io/pypi/pyversions/pygnssutils.svg?style=flat)
 [![PyPI version](https://img.shields.io/pypi/v/pygnssutils.svg?style=flat)](https://pypi.org/project/pygnssutils/)
-[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/master/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
+[![PyPI downloads](https://github.com/semuconsulting/pygpsclient/blob/main/images/clickpy_top10.svg?raw=true)](https://clickpy.clickhouse.com/dashboard/pygnssutils)
 `pygnssutils` is compatible with Python>=3.10.
@@ -138,7 +134,6 @@ class pygnssutils.gnssstreamer.GNSSStreamer(**kwargs)
    - 0 = none (default)
    - 1 = RTK NTRIP RTCM caster
    - 2 = RTK NTRIP SPARTN caster
-   - 3 = RTK MQTT SPARTN source (see [gnssmqttclient](#gnssmqttclient) for MQTT client configuration details)
    - 4 = serial port
    - 5 = binary file.
@@ -428,41 +423,6 @@ gnssntripclient -h
 Refer to the [Sphinx API documentation](https://www.semuconsulting.com/pygnssutils/pygnssutils.html#module-pygnssutils.gnssntripclient) for further details.
----
-## <a name="gnssmqttclient">GNSSMQTTClient and gnssmqttclient CLI</a>
-```
-class pygnssutils.gnssmqttclient.GNSSMQTTClient(app=None, **kwargs)
-```
-The `GNSSMQTTClient` class provides a basic SPARTN IP (MQTT) Client capability and forms the basis of a [`gnssmqttclient`](#gnssmqttclient) CLI utility. It receives RTK correction data from a SPARTN IP (MQTT) location service (e.g. the u-blox / Thingstream PointPerfect service) and (optionally) sends this to a designated output stream.
-### CLI Usage:
-The `clientid` provided by the location service may be set as environment variable `MQTTCLIENTID`. If this environment variable is set and the TLS certificate (\*.crt) and key (\*.pem) files provided by the location service are placed in the user's `HOME` directory, the utility can use these as default settings and may be invoked without any arguments.
-Assuming the Python 3 scripts (bin) directory is in your PATH, the CLI utility may be invoked from the shell thus (press CTRL-C to terminate):
-```shell
-gnssmqttclient --clientid yourclientid --server pp.services.u-blox.com --port 8883 --region eu --mode 0 --topic_ip 1 --topic_mga 1 --topic_key 1 --tlscrt '/Users/{your-user}/device-{your-clientid}-pp-cert.crt' --tlskey '/Users/{your-user}/device-{your-client-id}-pp-key.pem'} --spartndecode 0 --clioutput 0 --verbosity 2
-```
-```
-2024-08-15 09:14:50.544 - INFO - pygnssutils.gnssmqttclient - Starting MQTT client with arguments {'server': 'pp.services.u-blox.com', 'port': 8883, 'clientid': 'your-client-id', 'region': 'eu', 'mode': 0, 'topic_ip': 1, 'topic_mga': 1, 'topic_key': 1, 'tlscrt': '/Users/myuser/device-your-client-id-pp-cert.crt', 'tlskey': '/Users/myuser/device-your-client-id-pp-key.pem', 'spartndecode': 0, 'output': None}.
-2024-08-15 09:14:50.840 - INFO - pygnssutils.gnssmqttclient - RXM-SPARTN-KEY
-2024-08-15 09:14:50.854 - INFO - pygnssutils.gnssmqttclient - MGA-INI-TIME-UTC
-2024-08-15 09:14:50.858 - INFO - pygnssutils.gnssmqttclient - MGA-GPS-EPH
-...
-```
-Command line arguments can be stored in a configuration file and invoked using the `-C` or `--config` argument. The location of the configuration file can be set in environment variable `GNSSMQTTCLIENT_CONF`.
-For help and full list of optional arguments, type:
-```shell
-gnssmqttclient -h
-```
-Refer to the [pyspartn documentation](https://github.com/semuconsulting/pyspartn?tab=readme-ov-file#reading) for further details on decrypting encrypted (`eaf=1`) SPARTN payloads.
 ---
 ## <a name="socketserver">SocketServer</a>
@@ -627,6 +587,8 @@ semuadmin@semuconsulting.com
 ![License](https://img.shields.io/github/license/semuconsulting/pygnssutils.svg)
+[![ORCID iD icon](https://orcid.org/sites/default/files/images/orcid_16x16.png) https://orcid.org/0009-0002-5751-8719](https://orcid.org/0009-0002-5751-8719)
 `pygnssutils` is maintained entirely by unpaid volunteers. It receives no funding from advertising or corporate sponsorship. If you find the utility useful, please consider sponsoring the project with the price of a coffee...
 [![Sponsor](https://github.com/semuconsulting/pyubx2/blob/master/images/sponsor.png?raw=true)](https://buymeacoffee.com/semuconsulting)

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/pyproject.toml RENAMED Viewed

@@ -5,8 +5,11 @@ build-backend = "setuptools.build_meta:__legacy__"
 [project]
 name = "pygnssutils"
 dynamic = ["version"]
-authors = [{ name = "Steve Smith", email = "semuadmin@semuconsulting.com" }]
-maintainers = [{ name = "Steve Smith", email = "semuadmin@semuconsulting.com" }]
+authors = [{ name = "Steve Smith" }, { email = "semuadmin@semuconsulting.com" }]
+maintainers = [
+    { name = "Steve Smith" },
+    { email = "semuadmin@semuconsulting.com" },
+]
 description = "GNSS Command Line Utilities"
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
@@ -28,21 +31,22 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Utilities",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Scientific/Engineering :: GIS",
 ]
 dependencies = [
-    "certifi>=2025.0.0",
-    "paho-mqtt>=2.1.0",
+    "certifi>=2026.0.0",
+    "pynmeagps>=1.1.7",
+    "pyqgc>=1.0.0",
+    "pyrtcm>=1.2.0",
+    "pysbf2>=1.0.4",
     "pyserial>=3.5",
     "pyspartn>=1.0.8",
-    "pyubx2>=1.3.6",
-    "pynmeagps>=1.1.5",
-    "pysbf2>=1.0.4",
+    "pyubx2>=1.3.7",
     "pyubxutils>=1.0.6",
-    "pyqgc>=1.0.0",
     "pyunigps>=1.0.0",
 ]
@@ -50,7 +54,6 @@ dependencies = [
 gnssstreamer = "pygnssutils.gnssstreamer_cli:main"
 gnssserver = "pygnssutils.gnssserver_cli:main"
 gnssntripclient = "pygnssutils.gnssntripclient_cli:main"
-gnssmqttclient = "pygnssutils.gnssmqttclient_cli:main"
 pyrinexconv = "pygnssutils.rinex_conv_cli:main"
 [project.urls]

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/__init__.py RENAMED Viewed

@@ -12,7 +12,6 @@ from pyubxutils.ubxsimulator import UBXSimulator
 from pygnssutils._version import __version__
 from pygnssutils.exceptions import GNSSError, GNSSStreamError, ParameterError
 from pygnssutils.globals import *
-from pygnssutils.gnssmqttclient import GNSSMQTTClient
 from pygnssutils.gnssntripclient import GNSSNTRIPClient
 from pygnssutils.gnssreader import (
     NMEA_PROTOCOL,
@@ -26,7 +25,6 @@ from pygnssutils.gnssreader import (
 from pygnssutils.gnssserver import GNSSSocketServer
 from pygnssutils.gnssstreamer import GNSSStreamer
 from pygnssutils.helpers import *
-from pygnssutils.mqttmessage import *
 from pygnssutils.rawnav import *
 from pygnssutils.rinex_conv import RinexConverter

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/_version.py RENAMED Viewed

@@ -8,4 +8,4 @@ Created on 2 Oct 2020
 :license: BSD 3-Clause
 """
-__version__ = "1.2.6"
+__version__ = "1.2.8"

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/gnssreader.py RENAMED Viewed

@@ -13,7 +13,7 @@ Returns both the raw binary data (as bytes) and the parsed data.
 - 'protfilter' governs which protocols (NMEA, UBX, SBF, QGC, UNI or RTCM3) are processed.
 - 'msgfilter' governs which individual message types are processed.
-- `parsing` governs whether payloads are fully or partially parsed.
+- `parsing` governs whether individual payloads are parsed.
 - 'quitonerror' governs how errors are handled.
 - 'msgmode' indicates the type of UBX datastream (output GET, input SET, query POLL).
   If msgmode is set to SETPOLL, input/query mode will be automatically detected by parser.
@@ -318,8 +318,7 @@ class GNSSReader:
         raw_data = None
         parsed_data = None
-        parsing = True
-        while parsing:  # loop until end of valid message or EOF
+        while True:  # loop until end of valid message or EOF
             try:
                 raw_data = None
@@ -336,38 +335,34 @@ class GNSSReader:
                     # if protocol filter passes UBX, return message,
                     # otherwise discard and continue
                     if self._protfilter & UBX_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an NMEA message (b'\x24\x..)
-                elif bytehdr in NMEA_HDR:
+                if bytehdr in NMEA_HDR:
                     raw_data, parsed_data = self._parse_nmea(bytehdr)
                     # if protocol filter passes NMEA, return message,
                     # otherwise discard and continue
                     if self._protfilter & NMEA_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an SBF message (b'\x24\x40')
-                elif bytehdr in SBF_HDR:
+                if bytehdr in SBF_HDR:
                     raw_data, parsed_data = self._parse_sbf(bytehdr)
                     # if protocol filter passes SBF, return message,
                     # otherwise discard and continue
                     if self._protfilter & SBF_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an QGCmessage (b'\x51\x47')
-                elif bytehdr in QGC_HDR:
+                if bytehdr in QGC_HDR:
                     raw_data, parsed_data = self._parse_qgc(bytehdr)
                     # if protocol filter passes QGC, return message,
                     # otherwise discard and continue
                     if self._protfilter & QGC_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's an UNImessage (b'\xaa\x44\xb5')
-                elif bytehdr in UNI_HDR[:2]:
+                if bytehdr in UNI_HDR[:2]:
                     byte3 = self._read_bytes(1)
                     bytehdr += byte3
                     if bytehdr != UNI_HDR:
@@ -376,21 +371,18 @@ class GNSSReader:
                     # if protocol filter passes UNI, return message,
                     # otherwise discard and continue
                     if self._protfilter & UNI_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
+                        break
+                    continue
                 # if it's a RTCM3 message
                 # (byte1 = 0xd3; byte2 = 0b000000**)
-                elif byte1 == b"\xd3" and (byte2[0] & ~0x03) == 0:
+                if byte1 == b"\xd3" and (byte2[0] & ~0x03) == 0:
                     raw_data, parsed_data = self._parse_rtcm3(bytehdr)
                     # if protocol filter passes RTCM, return message,
                     # otherwise discard and continue
                     if self._protfilter & RTCM3_PROTOCOL:
-                        parsing = False
-                    else:
-                        continue
-                else:
-                    raise GNSSStreamError(f"Unknown protocol header {bytehdr}.")
+                        break
+                    continue
+                raise GNSSStreamError(f"Unknown protocol header {bytehdr}.")
             except EOFError:
                 return (None, None)

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/gnssstreamer_cli.py RENAMED Viewed

@@ -17,7 +17,6 @@ Supported output channels:
 Supported input channels:
  - NTRIP RTCM client
  - NTRIP SPARTN client
- - MQTT SPARTN client
  - serial stream
  - file stream
@@ -57,7 +56,6 @@ from pygnssutils.globals import (
     FORMAT_PARSED,
     FORMAT_PARSEDSTRING,
     INPUT_FILE,
-    INPUT_MQTT_SPARTN,
     INPUT_NONE,
     INPUT_NTRIP_RTCM,
     INPUT_NTRIP_SPARTN,
@@ -73,7 +71,6 @@ from pygnssutils.globals import (
     OUTPUT_TEXT_FILE,
     UBXSIMULATOR,
 )
-from pygnssutils.gnssmqttclient import GNSSMQTTClient
 from pygnssutils.gnssntripclient import GNSSNTRIPClient
 from pygnssutils.gnssreader import (
     ERR_LOG,
@@ -162,34 +159,6 @@ def _setup_input_ntrip(app: object, datatype: str, **kwargs) -> object:
     return gnc
-def _setup_input_mqtt(app: object, datatype: str, **kwargs) -> object:
-    """
-    Set up MQTT SPARTN client as input data source.
-    :param app: calling application (i.e. gnssstreamer)
-    :param datatype: "MQTT"
-    :returns: reference to MQTT client
-    :rtype: GNSSMQTTClient
-    """
-    # pylint: disable=unused-argument
-    prot, hostname, port, path = parse_url(kwargs["input"])
-    prot = 1 if prot == "https" else 0
-    gmq = GNSSMQTTClient(app)
-    gmq.start(
-        server=hostname,
-        port=port,
-        clientid=kwargs.get("rtkuser", "anon"),
-        region=path.lower(),  # e.g. "eu"
-        mode=0,  # IP (as opposed to 1 = L-Band)
-        output=kwargs["inqueue"],  # send SPARTN data to receiver
-    )
-    return gmq
 def _setup_input_stream(app: object, datatype: str, **kwargs) -> object:
     """
     Set up serial stream as input data source.
@@ -379,8 +348,6 @@ def _run_streamer(stream, **kwargs):
                 _setup_input_ntrip(gns, "RTCM", **kwargs)
             elif cliinput == INPUT_NTRIP_SPARTN:
                 _setup_input_ntrip(gns, "SPARTN", **kwargs)
-            elif cliinput == INPUT_MQTT_SPARTN:
-                _setup_input_mqtt(gns, "MQTT", **kwargs)
             elif cliinput == INPUT_SERIAL:
                 _setup_input_stream(gns, "SERIAL", **kwargs)
             elif cliinput == INPUT_FILE:
@@ -568,7 +535,6 @@ def main():
             f"CLI input type {INPUT_NONE} = none, "
             f"{INPUT_NTRIP_RTCM} = RTK NTRIP RTCM, "
             f"{INPUT_NTRIP_SPARTN} = RTK NTRIP SPARTN, "
-            f"{INPUT_MQTT_SPARTN} = RTK MQTT SPARTN, "
             f"{INPUT_SERIAL} = serial port, "
             f"{INPUT_FILE} = binary file"
         ),
@@ -577,7 +543,6 @@ def main():
             INPUT_NONE,
             INPUT_NTRIP_RTCM,
             INPUT_NTRIP_SPARTN,
-            INPUT_MQTT_SPARTN,
             INPUT_SERIAL,
             INPUT_FILE,
         ],
@@ -592,8 +557,6 @@ def main():
             "(e.g. 'http://rtk2go.com:2101/MOUNTPOINT'); "
             f"If cliinput = {INPUT_NTRIP_SPARTN}, format = full url "
             "(e.g. 'https://ppntrip.services.u-blox.com:2102/EU'); "
-            f"If cliinput = {INPUT_MQTT_SPARTN}, format = full url "
-            "(e.g. 'https://pp.services.u-blox.com:8883/eu', where /path signifies region); "
             f"If cliinput = {INPUT_SERIAL}, format = port@baudrate (e.g. '/dev/tty.ACM1@38400'); "
             f"If cliinput = {INPUT_FILE}, format = file name (e.g. '/home/myuser/ubxconfig.ubx'). "
             "NB: gnssstreamer will have exclusive use of any serial port."

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/rinex_globals.py RENAMED Viewed

@@ -52,7 +52,7 @@ NEQUICK = "NEQUICK"
 NMEA = "nmea"
 OBS = "O"
 OMEGADOTREF = -2.6e-9
-PYRINEXCONV_VERSION = "0.1.7 Alpha"
+PYRINEXCONV_VERSION = "0.2.0 Beta"
 QZS = "J"
 RINEX_CANCELLED = 2
 RINEX_ERROR = 99

{pygnssutils-1.2.6 → pygnssutils-1.2.8}/src/pygnssutils/rinex_helpers.py RENAMED Viewed

@@ -1355,7 +1355,7 @@ def format_licenseofuse(lou: str = "") -> str:
     if lou == "":
         return ""
-    return f"{license:<{DATAWIDTH}}LICENSE OF USE\n"
+    return f"{lou:<{DATAWIDTH}}LICENSE OF USE\n"
 def format_stationinfo(station: str = "") -> str:

pygnssutils 1.2.6__tar.gz → 1.2.8__tar.gz

pygnssutils 1.2.6tar.gz → 1.2.8tar.gz