pyredshift 1.16__tar.gz → 1.17__tar.gz

{pyredshift-1.16 → pyredshift-1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyredshift
-Version: 1.16
+Version: 1.17
 Summary: Interactive redshifting of 1D astronomical spectra (Python successor of pdlredshift / redshift.f)
 Home-page: https://github.com/karlglazebrook/pyredshift
 Author: Karl Glazebrook
@@ -70,6 +70,7 @@ Requires python ≥ 3.9 with numpy, matplotlib, astropy and scipy.
 
 ```
 pyredshift spectrum.fits              # format auto-detected
+pyredshift https://host/spectrum.fits # straight from an archive URL
 pyredshift spectrum.fits -f sdss      # force a format
 pyredshift spectrum.fits -z 2.19      # start from a known redshift
 pyredshift spectrum.fits --retro      # retro PGPLOT-style black background

{pyredshift-1.16 → pyredshift-1.17}/README.md

@@ -36,6 +36,7 @@ Requires python ≥ 3.9 with numpy, matplotlib, astropy and scipy.
 
 ```
 pyredshift spectrum.fits              # format auto-detected
+pyredshift https://host/spectrum.fits # straight from an archive URL
 pyredshift spectrum.fits -f sdss      # force a format
 pyredshift spectrum.fits -z 2.19      # start from a known redshift
 pyredshift spectrum.fits --retro      # retro PGPLOT-style black background

{pyredshift-1.16 → pyredshift-1.17}/pyredshift

@@ -199,6 +199,27 @@ def read_outthere(hdul):
     return wav, spec
 
 
+def fetch_url(url):
+    """Download a spectrum URL to a temporary file and return its path.
+    The URL's file extension is kept so format auto-detection still works."""
+    import shutil
+    import tempfile
+    import urllib.request
+    from urllib.parse import urlparse
+    suffix = os.path.splitext(urlparse(url).path)[1] or ".fits"
+    print("Downloading %s ..." % url)
+    fd, path = tempfile.mkstemp(prefix="pyredshift-", suffix=suffix)
+    try:
+        with urllib.request.urlopen(url, timeout=120) as resp, \
+                os.fdopen(fd, "wb") as out:
+            shutil.copyfileobj(resp, out)
+    except Exception as e:
+        os.unlink(path)
+        sys.exit("Could not download %s\n  (%s)" % (url, e))
+    print("  %d bytes" % os.path.getsize(path))
+    return path
+
+
 def read_spectrum(fname, fmt=None):
     if not os.path.exists(fname):
         sys.exit("File %s not found" % fname)
@@ -270,7 +291,7 @@ def main():
     ap = argparse.ArgumentParser(
         prog="pyredshift",
         usage="pyredshift [-help] [-f FORMAT] [-z REDSHIFT] [--retro] "
-              "[--microns] file",
+              "[--microns] file_or_URL",
         description="Interactive redshifting of 1D spectra "
                     "(port of pdlredshift), v%s." % redshift_module.__version__,
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -278,7 +299,9 @@ def main():
         # -h epilog and the '?' help page cannot drift apart
         epilog=redshift_module.formats_text())
     ap.add_argument("-help", action="help", help=argparse.SUPPRESS)
-    ap.add_argument("file", help="spectrum file (FITS, CSV or 2-column ascii)")
+    ap.add_argument("file", metavar="file_or_URL",
+                    help="spectrum file (FITS, CSV or 2-column ascii), "
+                         "or an http(s)/ftp URL of one")
     ap.add_argument("-f", "--format", default=None, metavar="FORMAT",
                     help="force the input format instead of auto-detecting")
     ap.add_argument("-z", "--redshift", type=float, default=None,
@@ -292,14 +315,23 @@ def main():
                     help=argparse.SUPPRESS)  # deprecated alias for --retro
     args = ap.parse_args()
 
-    wav, spec, has_wcs = read_spectrum(args.file, args.format)
+    # A URL instead of a file: download to a temp file, label by its name
+    fname, label, tmp = args.file, os.path.basename(args.file), None
+    if re.match(r"^(https?|ftp)://", args.file, re.I):
+        from urllib.parse import urlparse
+        tmp = fname = fetch_url(args.file)
+        label = os.path.basename(urlparse(args.file).path) or args.file
+
+    wav, spec, has_wcs = read_spectrum(fname, args.format)
+    if tmp is not None:
+        os.unlink(tmp)  # arrays are in memory; the download can go
 
     if np.nanmax(wav) < 100 and has_wcs and not args.microns:
         print("  Detected microns -> Angstroms  (--microns to keep)")
         wav = wav * 10000.0
 
     z = redshift_module.redshift(wav, spec, args.redshift,
-                                 os.path.basename(args.file), dark=args.retro)
+                                 label, dark=args.retro)
     if z is not None:
         print("Final redshift = %.6g" % z)
 

{pyredshift-1.16 → pyredshift-1.17}/setup.py

@@ -13,7 +13,7 @@ from setuptools import setup
 
 setup(
     name="pyredshift",
-    version="1.16",
+    version="1.17",
     description="Interactive redshifting of 1D astronomical spectra "
                 "(Python successor of pdlredshift / redshift.f)",
     long_description=open("README.md").read(),

{pyredshift-1.16 → pyredshift-1.17}/src/pyredshift/redshift.py

@@ -75,6 +75,9 @@ V1.16 - Bare modifier presses are no longer input: ESC shift-O works
      - matplotlib 3.11 compatibility: keep full-figure blitting on
        when another axes overlaps (3.11 would silently disable it on
        tall windows), manage the cursor background ourselves.
+V1.17 - An http(s)/ftp URL may be given instead of a file: downloaded
+       to a temp file (extension kept so auto-detection works, deleted
+       once read), window labelled with the URL's filename.
 """
 
 import ctypes
@@ -120,7 +123,7 @@ try:
 except AttributeError:
     pass
 
-__version__ = "1.16"
+__version__ = "1.17"
 
 C_LIGHT = 2.99792458e8  # m/s
 
@@ -143,9 +146,11 @@ FORMAT_HELP = [
     ("csv", "comma-separated, header rows skipped"),
     ("ascii", "2-column text"),
 ]
-FORMAT_NOTES = ("Default is auto-detection. Wavelengths that look like "
-                "microns are converted to Angstroms (--microns keeps them); "
-                "NaNs are treated as bad pixels and plot as gaps.")
+FORMAT_NOTES = ("Default is auto-detection. An http(s)/ftp URL may be given "
+                "instead of a file (downloaded to a temp file). Wavelengths "
+                "that look like microns are converted to Angstroms "
+                "(--microns keeps them); NaNs are treated as bad pixels "
+                "and plot as gaps.")
 
 CONFIG_FILE = os.path.expanduser("~/.pyredshift.json")  # remembers window size
 DEFAULT_FIGSIZE = (13.0, 5.5)  # inches

{pyredshift-1.16 → pyredshift-1.17}/src/pyredshift.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyredshift
-Version: 1.16
+Version: 1.17
 Summary: Interactive redshifting of 1D astronomical spectra (Python successor of pdlredshift / redshift.f)
 Home-page: https://github.com/karlglazebrook/pyredshift
 Author: Karl Glazebrook
@@ -70,6 +70,7 @@ Requires python ≥ 3.9 with numpy, matplotlib, astropy and scipy.
 
 ```
 pyredshift spectrum.fits              # format auto-detected
+pyredshift https://host/spectrum.fits # straight from an archive URL
 pyredshift spectrum.fits -f sdss      # force a format
 pyredshift spectrum.fits -z 2.19      # start from a known redshift
 pyredshift spectrum.fits --retro      # retro PGPLOT-style black background