Merge branch 'master' of github.com:astropy/astropy-tutorials

Author: eblur

.circleci/config.yml

@@ -13,10 +13,9 @@ pip-run: &pip-install
   command: |
     python3 -m venv venv
     . venv/bin/activate
-    pip install -r pip-requirements.txt
-    pip install sphinx pytest
-    pip install sphinx-astropy sphinx-bootstrap-theme
-    pip install git+https://github.com/jupyter/nbconvert
+    pip install -r pip-requirements.txt  --progress-bar off
+    pip install --progress-bar off sphinx pytest
+    pip install --progress-bar off sphinx-astropy sphinx-bootstrap-theme nbconvert==5.6.1
 
 jobs:
 
@@ -68,4 +67,4 @@ jobs:
 
 notify:
   webhooks:
-    - url: https://giles.cadair.com/circleci
+    - url: https://giles.cadair.dev/circleci

environment.yml

@@ -4,16 +4,7 @@ channels:
   - astropy
 
 dependencies:
-  - python=3.6
-  - IPython=6.1.0
-  - astropy=3
-  - astroquery>=0.3.7
-  - matplotlib==3.0.2
-  - numpy=1.14
-  - scipy=1.0 # needed for coordinates cross-matching
-  - jupyter=1.0
-  - notebook>=5.7.2
-  - aplpy # used in FITS-cube tutorial
-  - spectral-cube # used in FITS-cube tutorial
-  - reproject # used in FITS-cube tutorial
-  - dust_extinction>=0.7
+  - python=3.7
+  - pip
+  - pip:
+    - -r pip-requirements.txt

pip-requirements.txt

@@ -8,7 +8,7 @@ scipy>=1.0
 notebook>=5.7.2
 aplpy
 spectral-cube
-reproject
+reproject==0.5.1
 dust_extinction>=0.7
 astro-gala
 dust_extinction>=0.7

…als/notebooks/coordinates/HCG7_2MASS.tbl quarantine/coordinates/HCG7_2MASS.tbltutorials/notebooks/coordinates/HCG7_2MASS.tbl renamed to quarantine/coordinates/HCG7_2MASS.tbl tutorials/notebooks/coordinates/HCG7_2MASS.tbl renamed to quarantine/coordinates/HCG7_2MASS.tbl

@@ -136,3 +136,37 @@ Marking a cell with an intentional error
 Edit the cell metadata of the cell in which you would like to raise an exception
 and add the following to the top-level JSON: ``"tags": ["raises-exception"]``
 This tag is recognized by the latest (master) version of nbconvert.
+
+Automatically Strip Output and Notebook Metadata
+------------------------------------------------
+
+Jupyter notebooks contain some metadata that is typically hidden from users,
+which contains, for example, information about the Python kernel used to run it, the
+version of IPython, etc. When tutorial authors or maintainers edit notebooks,
+this metadata is automatically modified by Jupyter, leading to superfluous and
+sometimes confusing changes to the notebooks when viewed in a "diff" locally or
+on GitHub.
+
+In order to prevent such metadata updates from appearing in pull requests, we
+therefore recommend that any contributor or maintainer install and use
+`nbstripout <https://github.com/kynan/nbstripout>`_ set up with an automatic Git
+hook to clean metadata changes whenever a notebook change is committed to your
+local repo. To install ``nbstripout``, first pip install it with:
+
+    pip install nbstripout
+
+This repo is already configured. Next, configure Git within your
+local clone of astropy-tutorials to tell ``nbstripout`` to intervene whenever
+you commit changes in the repo. To do this, you first have to "install" it with:
+
+    nbstripout --install
+
+Then, to tell ``nbstripout`` to ignore metadata changes, you must also run:
+
+    git config filter.nbstripout.extrakeys '
+        metadata.celltoolbar metadata.kernel_spec.display_name
+        metadata.kernel_spec.name metadata.language_info.codemirror_mode.version
+        metadata.language_info.pygments_lexer metadata.language_info.version
+        metadata.toc metadata.notify_time metadata.varInspector
+        cell.metadata.heading_collapsed cell.metadata.hidden
+        cell.metadata.code_folding cell.metadata.tags cell.metadata.init_cell'

…tebooks/coordinates/HCG7_SDSS_cutout.jpg …rantine/coordinates/HCG7_SDSS_cutout.jpgtutorials/notebooks/coordinates/HCG7_SDSS_cutout.jpg renamed to quarantine/coordinates/HCG7_SDSS_cutout.jpg tutorials/notebooks/coordinates/HCG7_SDSS_cutout.jpg renamed to quarantine/coordinates/HCG7_SDSS_cutout.jpg

@@ -21,7 +21,7 @@
     "\n",
     "## Summary\n",
     "\n",
-    "In this tutorial we will visualize 2D and 3D data sets in Galactic and equartorial coordinates. \n",
+    "In this tutorial we will visualize 2D and 3D data sets in Galactic and equatorial coordinates. \n",
     "\n",
     "The tutorial will walk you though a visual analysis of the Small Magellanic Cloud (SMC) using HI 21cm emission and a Herschel 250 micron map. We will learn how to read in data from a file, query and download matching data from Herschel using astroquery, and plot the resulting images in a multitude of ways. \n",
     "\n",
@@ -832,12 +832,28 @@
   },
   "language_info": {
    "codemirror_mode": {
-    "name": "ipython"
+    "name": "ipython",
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
-   "nbconvert_exporter": "python"
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,