ndscope 0.22.1__tar.gz → 0.22.3__tar.gz

{ndscope-0.22.1 → ndscope-0.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndscope
-Version: 0.22.1
+Version: 0.22.3
 Summary: Next-generation NDS time series plotting
 Author-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
 Maintainer-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope/__version__.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.22.1'
-__version_tuple__ = version_tuple = (0, 22, 1)
+__version__ = version = '0.22.3'
+__version_tuple__ = version_tuple = (0, 22, 3)
 
-__commit_id__ = commit_id = 'g390176927'
+__commit_id__ = commit_id = 'g4ca9d3562'

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope/channel_select.py

@@ -13,6 +13,12 @@ from qtpy.QtCore import Signal  # type: ignore
 from ndscope.math_config import MathConfigDialog
 
 from ._qt import load_ui
+from .configuration.configuration import load_config
+from .data_source_determination import (
+    parse_data_source_args,
+    add_data_source_args,
+    get_first_data_source,
+)
 from .plot import NDScopePlotChannel
 
 from typing import TYPE_CHECKING, Set, List, Dict
@@ -1415,10 +1421,7 @@ def main():
         description=DESCRIPTION,
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
-    parser.add_argument("--url", metavar="URL:PORT", help=f"Data source URL")
-    parser.add_argument(
-        "--nds", metavar="HOST[:PORT]", help=f"NDS server [{const.NDSSERVER}]"
-    )
+    add_data_source_args(parser)
     parser.add_argument(
         "glob",
         nargs="?",
@@ -1428,7 +1431,10 @@ def main():
 
     args = parser.parse_args()
 
-    url_text = util.resolve_data_source(args.nds, args.url)
+    args_conf = parse_data_source_args(args)
+    load_config(args_conf)
+
+    url_text = get_first_data_source()
 
     server, server_formatted = util.format_nds_server_string(url_text)
 
@@ -1447,7 +1453,7 @@ def main():
         logger.debug("done transform")
 
     dtt = dttlib.DTT(chans_callback)
-    cache = dttlib.NDS2Cache(1 << 30, "").as_ref()
+    cache = dttlib.NDS2Cache(1 << 30, "", url_text, dttlib.Replay.NoReplay()).as_ref()
     dtt.set_data_source(cache)
     logger.debug(
         f"Fetching channel list from {server} (channel glob: '{args.glob}')... "

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope/configuration/configuration.py

@@ -73,7 +73,9 @@ def _handle_environment() -> TOMLDocument:
     env_config = TOMLDocument()
 
     if "NDSSERVER" in os.environ:
-        env_config["data_source"] = {"urls": [f"nds://{os.environ['NDSSERVER']}"]}
+        env_config["data_source"] = {
+            "urls": [f"nds://{n}" for n in os.environ["NDSSERVER"].split(",")]
+        }
     elif "ARRAKIS_SERVER" in os.environ:
         env_config["data_source"] = {"urls": [os.environ["ARRAKIS_SERVER"]]}
 

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope/test/test_util.py

@@ -285,6 +285,13 @@ class TestResolveDataSource:
         result = self.resolve_data_source("--nds", "test.server.com:31200")
         assert "test.server.com" in result
 
+    def test_multiple_ndsserver(self):
+        """only first nds server should be used"""
+        env = {"NDSSERVER": "nds.test:8088,nds2.test:8088"}
+        with patch.dict(os.environ, env, clear=True):
+            result = self.resolve_data_source()
+        assert result == "nds://nds.test:8088"
+
     def test_alias_cit(self):
         """'cit' alias should resolve to caltech server"""
         result = self.resolve_data_source("--nds", "cit")

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndscope
-Version: 0.22.1
+Version: 0.22.3
 Summary: Next-generation NDS time series plotting
 Author-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>
 Maintainer-email: Jameson Graef Rollins <jameson.rollins@ligo.org>, Patrick Thomas <patrick.thomas@ligo.org>, Erik von Reis <erik.vonreis@ligo.org>

{ndscope-0.22.1 → ndscope-0.22.3}/ndscope.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.22.1",
+  "tag": "0.22.3",
   "distance": 0,
-  "node": "g39017692733ca857960a68c369ef7132b95c6ce5",
+  "node": "g4ca9d356298b88804a3bfffab2f7f37e415836db",
   "dirty": false,
   "branch": "master",
   "node_date": "2026-09-08"