cicwave 0.7.0__tar.gz → 0.7.1__tar.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 (23) hide show
  1. {cicwave-0.7.0/src/cicwave.egg-info → cicwave-0.7.1}/PKG-INFO +1 -1
  2. {cicwave-0.7.0 → cicwave-0.7.1}/pyproject.toml +1 -1
  3. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/cli.py +13 -2
  4. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/wave_pg.py +7 -3
  5. {cicwave-0.7.0 → cicwave-0.7.1/src/cicwave.egg-info}/PKG-INFO +1 -1
  6. {cicwave-0.7.0 → cicwave-0.7.1}/LICENSE +0 -0
  7. {cicwave-0.7.0 → cicwave-0.7.1}/README.md +0 -0
  8. {cicwave-0.7.0 → cicwave-0.7.1}/setup.cfg +0 -0
  9. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/__init__.py +0 -0
  10. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/analysis.py +0 -0
  11. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/apisource.py +0 -0
  12. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/command.py +0 -0
  13. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/mcp_server.py +0 -0
  14. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/ngraw.py +0 -0
  15. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/pivot.py +0 -0
  16. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/stdf.py +0 -0
  17. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/theme.py +0 -0
  18. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave/wavefiles.py +0 -0
  19. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave.egg-info/SOURCES.txt +0 -0
  20. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave.egg-info/dependency_links.txt +0 -0
  21. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave.egg-info/entry_points.txt +0 -0
  22. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave.egg-info/requires.txt +0 -0
  23. {cicwave-0.7.0 → cicwave-0.7.1}/src/cicwave.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cicwave
3
- Version: 0.7.0
3
+ Version: 0.7.1
4
4
  Summary: Advanced waveform viewer with PyQtGraph backend
5
5
  Author-email: Carsten Wulff <carsten@wulff.no>
6
6
  License: MIT
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "cicwave"
7
- version = "0.7.0"
7
+ version = "0.7.1"
8
8
  authors = [
9
9
  { name="Carsten Wulff", email="carsten@wulff.no" },
10
10
  ]
@@ -30,6 +30,7 @@ import os
30
30
  import re
31
31
  import sys
32
32
  import glob as _glob
33
+ import urllib.parse
33
34
  import click
34
35
  from .command import setup_logging
35
36
 
@@ -111,6 +112,13 @@ def _expand_glob_patterns(files, patterns):
111
112
  return tuple(out)
112
113
 
113
114
 
115
+ def _spec_path_of(path):
116
+ """Lower-cased path part of *path*, with any URL query string cut off."""
117
+ if _URL_RE.match(path):
118
+ return urllib.parse.urlsplit(path).path.lower()
119
+ return path.lower()
120
+
121
+
114
122
  def _is_source_spec_file(path):
115
123
  """True for a YAML/JSON pivot spec that fetches its own data.
116
124
 
@@ -126,8 +134,11 @@ def _is_source_spec_file(path):
126
134
  """
127
135
  #- Extension check first, so the pandas/Qt import chain behind
128
136
  #- apisource is paid for only when a YAML argument is actually given,
129
- #- and so a plain data URL is never fetched twice.
130
- if not path.lower().endswith((".yaml", ".yml")):
137
+ #- and so a plain data URL is never fetched twice. Test it against
138
+ #- the URL's path, not the whole URL: a generated spec is served at
139
+ #- something like `/spec.yaml?dut=X`, and the rest of cicwave already
140
+ #- ignores the query string when resolving a format.
141
+ if not _spec_path_of(path).endswith((".yaml", ".yml")):
131
142
  return False
132
143
  from .apisource import is_source_spec_file
133
144
  return is_source_spec_file(path)
@@ -10,6 +10,7 @@ import math
10
10
  import os
11
11
  import sys
12
12
  import re
13
+ from urllib.parse import urlsplit
13
14
  import numpy as np
14
15
  import pandas as pd
15
16
  from importlib.metadata import version as _pkg_version
@@ -3460,10 +3461,13 @@ class PgWaveWindow(QMainWindow):
3460
3461
  """
3461
3462
  from .apisource import is_source_spec_file
3462
3463
 
3463
- if path.lower().endswith('.cicwave.yaml'):
3464
+ #- Match on the path part: a spec served by an API can carry a
3465
+ #- query string, which the rest of cicwave already ignores when
3466
+ #- resolving a format.
3467
+ probe = (urlsplit(path).path if _is_url(path) else path).lower()
3468
+ if probe.endswith('.cicwave.yaml'):
3464
3469
  self.applySession(path)
3465
- elif (path.lower().endswith(('.yaml', '.yml'))
3466
- and is_source_spec_file(path)):
3470
+ elif probe.endswith(('.yaml', '.yml')) and is_source_spec_file(path):
3467
3471
  self.openSourceSpec(path)
3468
3472
  else:
3469
3473
  self.browser.openFile(path)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cicwave
3
- Version: 0.7.0
3
+ Version: 0.7.1
4
4
  Summary: Advanced waveform viewer with PyQtGraph backend
5
5
  Author-email: Carsten Wulff <carsten@wulff.no>
6
6
  License: MIT
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes