Merge branch 'main' into requirements

Author: jeffjennings

.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
     name: "Execute and convert the notebooks to HTML"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
         with:
           python-version: 3.12
 
@@ -40,13 +40,13 @@ jobs:
         run: |
           echo "::set-output name=artifactName::rendered-tutorials"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874  # v4.4.0
         with:
           name: ${{ steps.nameartifact.outputs.artifactName }}
           path: _build
 
       - name: Dispatch Learn Astropy deployment
-        uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0  # v3.0.0
         if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/main') && (github.repository == 'astropy/astropy-tutorials')}}
         with:
           token: ${{ secrets.DISPATCH_GITHUB_TOKEN }}

.github/workflows/prs.yml

@@ -16,12 +16,12 @@ jobs:
     name: "Execute and convert the notebooks to HTML"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
         with:
           python-version: 3.12
 
@@ -52,7 +52,7 @@ jobs:
         run: |
           echo "::set-output name=artifactName::rendered-tutorials"
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874  # v4.4.0
         with:
           name: ${{ steps.nameartifact.outputs.artifactName }}
           path: _build

.github/workflows/test-scripts.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.event.pull_request.labels.*.name, 'infrastructure')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3  # v5.2.0
         with:
           python-version: 3.9
 

tutorials/color-excess/color-excess.ipynb

@@ -201,7 +201,7 @@
    "outputs": [],
    "source": [
     "download_dir = pathlib.Path('~/.astropy/cache/astroquery/Mast').expanduser()\n",
-    "download_dir.mkdir(exist_ok=True)\n",
+    "download_dir.mkdir(exist_ok=True, parents=True)\n",
     "\n",
     "obsTable = Observations.query_object(\"HD 147933\", radius=\"1 arcsec\")\n",
     "obsTable_spec = obsTable[obsTable['dataproduct_type'] == 'spectrum']\n",
@@ -214,7 +214,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "obsids = obsTable_spec[39]['obsid']\n",
+    "# retrieve a specific 'obs_id' corresponding to the IUE spectrum\n",
+    "obsTable_spec.add_index('obs_id')\n",
+    "obsids = obsTable_spec.loc['lwr05639']['obsid']\n",
+    "\n",
     "dataProductsByID = Observations.get_product_list(obsids)\n",
     "manifest = Observations.download_products(dataProductsByID, \n",
     "                                          download_dir=str(download_dir))"
@@ -268,11 +271,11 @@
    "outputs": [],
    "source": [
     "custom_query = Simbad()\n",
-    "custom_query.add_votable_fields('fluxdata(U)','fluxdata(B)','fluxdata(V)')\n",
+    "custom_query.add_votable_fields('U','B','V')\n",
     "phot_table=custom_query.query_object('HD 147933')\n",
-    "Umag=phot_table['FLUX_U']\n",
-    "Bmag=phot_table['FLUX_B']\n",
-    "Vmag=phot_table['FLUX_V']"
+    "Umag=phot_table['U']\n",
+    "Bmag=phot_table['B']\n",
+    "Vmag=phot_table['V']"
    ]
   },
   {

tutorials/spectral-cube-reprojection/SpectralCubeReprojectExample.ipynb

@@ -533,7 +533,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cube2vel_reproj = cube2vel_spatialspectralsmooth.reproject(cube1vel.header)\n",
+    "# first we make a copy of the target (cube1vel) header and set its rest frequency \n",
+    "# to that of the cube we're reprojecting (cube2vel_spatialspectralsmooth)\n",
+    "# (see https://github.com/radio-astro-tools/spectral-cube/issues/874)\n",
+    "tgthdr = cube1vel.header\n",
+    "tgthdr['RESTFRQ'] = cube2vel_spatialspectralsmooth.header['RESTFRQ']\n",
+    "\n",
+    "# now we continue with the reprojection\n",
+    "cube2vel_reproj = cube2vel_spatialspectralsmooth.reproject(tgthdr)\n",
     "cube2vel_reproj"
    ]
   },
@@ -625,7 +632,7 @@
     "        cube2daskvel_spectralresample = cube2daskvel_smooth.spectral_interpolate(cube1vel.spectral_axis,\n",
     "                                                                             suppress_smooth_warning=True)\n",
     "        cube2daskvel_spatialspectralsmooth = cube2daskvel_spectralresample.convolve_to(common_beam)\n",
-    "        cube2daskvel_reproj = cube2daskvel_spatialspectralsmooth.reproject(cube1vel.header)\n",
+    "        cube2daskvel_reproj = cube2daskvel_spatialspectralsmooth.reproject(tgthdr) # as above, tgthdr is altered cube1vel header\n",
     "cube2daskvel_reproj"
    ]
   },

tutorials/vo/conesearch.ipynb

@@ -253,7 +253,10 @@
    "outputs": [],
    "source": [
     "my_db = vos_catalog.get_remote_catalog_db(conf.conesearch_dbname)\n",
-    "my_cat = my_db.get_catalog_by_url(result.url + '&')\n",
+    "try:\n",
+    "    my_cat = my_db.get_catalog_by_url(result.url)\n",
+    "except AttributeError:\n",
+    "    my_cat = my_db.get_catalog_by_url(result.url + '&')\n",
     "print(my_cat.dumps())"
    ]
   },