Merge branch 'main' of https://github.com/talister/etc into feature_a…

…dd_EFOSC2

.github/workflows/smoke-test.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.12']
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/testing-and-coverage.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.12']
 
     steps:
     - uses: actions/checkout@v3

pyproject.toml

@@ -17,9 +17,9 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "ipykernel", # Support for Jupyter notebooks
-    "astropy>=4.0",
+    "astropy>=4.0, <6.0",
     "toml",
-    "synphot>=0.3"
+    "synphot>=0.3, <1.3.0"
 ]
 
 # On a mac, install optional dependencies with `pip install '.[dev]'` (include the single quotes)
@@ -53,6 +53,7 @@ build-backend = "setuptools.build_meta"
 write_to = "src/etc/_version.py"
 
 [tool.pytest.ini_options]
+consider_namespace_packages = "True"
 testpaths = [
     "tests",
 ]

requirements.txt

@@ -1,8 +1,9 @@
-astropy<5.3
+numpy<2.0
+astropy<6.0
 jedi==0.17.2
 ipython
 toml
-synphot==1.1.1
+synphot==1.2.1
 pytest
 matplotlib
 importlib_resources==3.2.0; python_version < '3.9'

src/etc/config.py

@@ -466,9 +466,17 @@ class Conf(ConfigNamespace):
     }
 
     # STANDARD STARS
-    vega_file = ConfigItem("https://ssb.stsci.edu/cdbs/calspec/alpha_lyr_stis_010.fits", "Vega")
+    # Switched to local files to prevent remote fetch issues triggering synphot bug
+    # vega_file = ConfigItem("https://ssb.stsci.edu/cdbs/calspec/alpha_lyr_stis_010.fits", "Vega")
+    vega_file = ConfigItem(
+        os.path.join(os.path.dirname(__file__), "data", "spectra", "alpha_lyr_stis_010.fits"), "Vega"
+    )
+    # sun_file = ConfigItem(
+    # "https://ssb.stsci.edu/cdbs/calspec/sun_reference_stis_002.fits",
+    # "Solar reference spectrum from https://www.stsci.edu/hst/instrumentation/reference-data-for-calibration-and-tools/astronomical-catalogs/calspec.html",
+    # )
     sun_file = ConfigItem(
-        "https://ssb.stsci.edu/cdbs/calspec/sun_reference_stis_002.fits",
+        os.path.join(os.path.dirname(__file__), "data", "spectra", "sun_reference_stis_002.fits"),
         "Solar reference spectrum from https://www.stsci.edu/hst/instrumentation/reference-data-for-calibration-and-tools/astronomical-catalogs/calspec.html",
     )
 

src/etc/data/comp/optics/BAL15Y_glass.dat

@@ -0,0 +1,35 @@
+# Wavelength [nm]	Transmittance [0..1]
+# Transmission for Ohara BAL15Y and 10mm thickness
+# From: https://www.ohara-gmbh.com/fileadmin/user_upload/export-data/pdf/product_datasheets/BAL15Y_English_.pdf
+290     0
+300     0.17
+310     0.59
+320     0.840
+330     0.937
+340     0.971
+350     0.985
+360     0.992
+365     0.994
+370     0.995
+380     0.996
+390     0.997
+400     0.998
+420     0.998
+440     0.998
+460     0.998
+480     0.998
+500     0.999
+550     0.999
+600     0.999
+650     0.998
+700     0.999
+800     0.999
+900     0.998
+1000    0.996
+1200    0.995
+1400    0.989
+1600    0.992
+1800    0.984
+2000    0.972
+2200    0.927
+2400    0.890

src/etc/data/comp/optics/BSM51Y_glass.dat

@@ -0,0 +1,35 @@
+# Wavelength [nm]	Transmittance [0..1]
+# Transmission for Ohara BSM51Y and 10mm thickness
+# From: https://www.ohara-gmbh.com/fileadmin/user_upload/export-data/pdf/product_datasheets/BSM51Y_English_.pdf
+285     0
+290     0.03
+300     0.33
+310     0.69
+320     0.88
+330     0.950
+340     0.977
+350     0.988
+360     0.993
+370     0.996
+380     0.997
+390     0.998
+400     0.998
+420     0.998
+440     0.998
+460     0.999
+480     0.999
+500     0.999
+550     0.999
+600     0.999
+650     0.999
+700     0.999
+800     0.999
+900     0.999
+1000    0.997
+1200    0.997
+1400    0.985
+1600    0.992
+1800    0.983
+2000    0.967
+2200    0.89
+2400    0.78