Revert "all notebooks: move requirements cell down; ensure preamable …

…is in single cell" This reverts commit 02a05d6.
astropy · Sep 27, 2024 · f0fc52c · f0fc52c
1 parent 02a05d6
commit f0fc52c
Show file tree

Hide file tree

Showing 25 changed files with 85 additions and 598 deletions.
diff --git a/tutorials/FITS-cubes/FITS-cubes.ipynb b/tutorials/FITS-cubes/FITS-cubes.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -40,40 +37,25 @@
     "\n",
     "The primary libraries we'll be using are: [astroquery](http://www.astropy.org/astroquery/), [spectral_cube](https://spectral-cube.readthedocs.io/en/latest/), [reproject](https://reproject.readthedocs.io/en/stable/#), [matplotlib](https://matplotlib.org/)) \n",
     "\n",
-    "They can be installed using conda:\n",
-    "\n",
+    "They can be installed using conda:"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "```\n",
     "conda install -c conda-forge astroquery\n",
     "conda install -c conda-forge spectral-cube\n",
     "conda install -c conda-forge reproject\n",
-    "```\n",
-    "\n",
-    "Alternatively, if you don't use conda, you can use pip."
+    "```"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 1,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "astroquery\n",
-      "matplotlib\n",
-      "numpy\n",
-      "reproject\n",
-      "spectral_cube\n",
-      "\n"
-     ]
-    }
-   ],
    "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
+    "Alternatively, if you don't use conda, you can use pip."
    ]
   },
   {

diff --git a/tutorials/FITS-header/FITS-header.ipynb b/tutorials/FITS-header/FITS-header.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -37,26 +34,6 @@
     "keyword."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "\n"
-     ]
-    }
-   ],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/tutorials/FITS-images/FITS-images.ipynb b/tutorials/FITS-images/FITS-images.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -40,28 +37,6 @@
     "This tutorial demonstrates the use of `astropy.utils.data` to download a data file, then uses `astropy.io.fits` to open the file, and lastly uses `matplotlib` to view the image with different color scales and stretches and to make histograms. In this tutorial we've also included a demonstration of simple image stacking."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 25,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "matplotlib\n",
-      "numpy\n",
-      "\n"
-     ]
-    }
-   ],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/tutorials/FITS-tables/FITS-tables.ipynb b/tutorials/FITS-tables/FITS-tables.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -37,28 +34,6 @@
     "This tutorial demonstrates the use of `astropy.utils.data` to download a data file, then uses `astropy.io.fits` and `astropy.table` to open the file. Lastly, `matplotlib` is used to visualize the data as a histogram."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "matplotlib\n",
-      "numpy\n",
-      "\n"
-     ]
-    }
-   ],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/tutorials/Models-Quick-Fit/Models-Quick-Fit.ipynb b/tutorials/Models-Quick-Fit/Models-Quick-Fit.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -37,30 +34,6 @@
     "In this tutorial, we will become familiar with the models available in [astropy.modeling](http://docs.astropy.org/en/stable/modeling/ ) and learn how to make a quick fit to our data."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "astroquery\n",
-      "matplotlib\n",
-      "numpy\n",
-      "scipy\n",
-      "\n"
-     ]
-    }
-   ],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/tutorials/SpectroscopicDataReductionBasics/1-SpectroscopicTraceTutorial.ipynb b/tutorials/SpectroscopicDataReductionBasics/1-SpectroscopicTraceTutorial.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-<<<<<<< Updated upstream
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
@@ -12,8 +11,6 @@
    ]
   },
   {
-=======
->>>>>>> Stashed changes
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
@@ -41,31 +38,6 @@
     "A spectroscopic trace is the path of a point source (star) spectrum through a two-dimensional dispersed spectrum.  The trace is needed because, in general, spectra are not perfectly aligned with the axes of a detector."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Required packages for this notebook:\n",
-      "astropy\n",
-      "astroquery\n",
-      "IPython\n",
-      "numpy\n",
-      "PIL\n",
-      "pylab\n",
-      "\n"
-     ]
-    }
-   ],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {

diff --git a/tutorials/SpectroscopicDataReductionBasics/2-WavelengthCalibration.ipynb b/tutorials/SpectroscopicDataReductionBasics/2-WavelengthCalibration.ipynb
@@ -1,5 +1,15 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "with open('requirements.txt') as f:\n",
+    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -12,8 +22,13 @@
     "\n",
     "\n",
     "\n",
-    "This notebook assumes you've completed the Spectroscopic Trace process (see [Part 1](1-SpectroscopicTraceTutorial.ipynb)) and have a trace model handy.\n",
-    "\n",
+    "This notebook assumes you've completed the Spectroscopic Trace process (see [Part 1](1-SpectroscopicTraceTutorial.ipynb)) and have a trace model handy."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "## Authors\n",
     "Adam Ginsburg, Kelle Cruz, Lia Corrales, Jonathan Sick, Adrian Price-Whelan\n",
     "\n",
@@ -33,16 +48,6 @@
     "Finally, it will show how to fit a wavelength solution to a calibration spectrum, integrating information from multiple calibration lamps."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with open('requirements.txt') as f:\n",
-    "    print(f\"Required packages for this notebook:\\n{f.read()}\")"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,