Develop sync

MANIFEST.in

@@ -15,7 +15,7 @@ recursive-include scripts *
 prune build
 prune docs/_build
 prune docs/api
-prune pypeit/deprecated
+prune deprecated
 
 global-exclude *.pyc *.o *.so *.DS_Store
 

doc/Makefile

@@ -56,7 +56,7 @@ clean:
 	rm -rf $(LOCALFILES)
 
 apirst:
-	SPHINX_APIDOC_OPTIONS=$(SPHINXAPIOPT) $(SPHINXAPI) --separate -o ./api ../pypeit ../pypeit/tests/* ../pypeit/deprecated/* ../pypeit/version.py ../pypeit/compiler_version*
+	SPHINX_APIDOC_OPTIONS=$(SPHINXAPIOPT) $(SPHINXAPI) --separate -o ./api ../pypeit ../pypeit/tests/* ../pypeit/version.py ../pypeit/compiler_version*
 	wget -O ./include/dev_suite_readme.rst https://raw.githubusercontent.com/pypeit/PypeIt-development-suite/main/README.rst
 	python ./scripts/build_datacontainer_datamodels.py
 	python ./scripts/build_dependency_rst.py

doc/dev/development.rst

@@ -422,6 +422,12 @@ are as follows:
  * The docstrings for any changes to existing methods that were altered
    must have been modified so that they are up-to-date and accurate.
 
+ * The documentation must be successfully recompiled, either using the
+   ``update_docs`` scripts or but running ``make clean ; make html`` in the
+   ``doc/`` directory.  (We plan for this to be added to the dev-suite testing;
+   in the meantime, PR authors simply need to affirm that the documentation
+   builds successfully.)
+
  * Spurious commented code used for debugging or testing is fine, but
    please let us know if you want it to be kept by adding a relevant
    comment, something like ``# TODO: Keep this around for now``, at the
@@ -491,7 +497,11 @@ tagging process is as follows:
         # Push the new tag
         git push --tags
 
- * The tag is released for `pip`_ installation.
+   Similarly, a matching tag is executed for the dev-suite code (these tags only
+   exist for versions 1.15 and later).
+
+ * The tag of the ``pypeit`` code-base (not the dev-suite) is released for
+   `pip`_ installation.
 
     .. code-block:: bash
 

doc/releases/1.14.1dev.rst → doc/releases/1.15.0.rst

@@ -1,12 +1,13 @@
 
-Version 1.14.1dev
-=================
+Version 1.15.0
+==============
 
 Installation Changes
 --------------------
-- PypeIt will no longer be available through ``conda-forge`` and
-  must be installed via ``pip`` from PyPI.  Users may still use
-  ``conda`` for management of PypeIt's virtual environment.
+
+- PypeIt will no longer be available through ``conda-forge`` and must be
+  installed via ``pip`` from PyPI.  Users may still use ``conda`` for management
+  of PypeIt's virtual environment.
 
 Dependency Changes
 ------------------
@@ -33,7 +34,6 @@ Functionality/Performance Improvements and Additions
 - Add a sensible error message to the pypeit Spectrum1D loaders in the event a
   user inadvertently tries to use Spectrum1D instead of SpectrumList for a
   ``spec1d`` file.
-- Add support for the R4K detector for MDM OSMOS
 - Enabled interpolation and extrapolation of missing echelle orders.  This is
   currently only used for Keck/HIRES, but the code is general.
 - Allow the specification of wavelength limits on the flexure cross-correlation
@@ -44,16 +44,15 @@ Functionality/Performance Improvements and Additions
   code, but the name ``'polynomial'`` is deprecated and will be removed in the
   future.
 - Introduced PCA method for telluric corrections
-- Added a new GUI for creating and editing PypeIt input files: ``pypeit_setup_gui``
 - Added slicer subpixel sampling for DataCube generation
-
 - Added ``trace_rms_tol`` parameter for edge tracing, which helps guard against
   poorly constrained traces for spectrally truncated slits/orders.
 
 Instrument-specific Updates
 ---------------------------
 
-- Updated archival sensivity functions for DEIMOS 1200G, 800G, and 600ZD gratings.
+- Add support for the R4K detector for MDM OSMOS
+- Updated archival sensitivity functions for DEIMOS 1200G, 800G, and 600ZD gratings.
 - Keck/KCWI and Keck/KCRM: Turned on polynomial correction for sky subtraction.
 - We now support the reduction of VLT/FORS2 data taken in MOS mode.
 - Fixed fluxing file format in the ``Keck-DEIMOS HOWTO`` documentation.
@@ -82,6 +81,7 @@ Script Changes
 - Column ``SpatID`` in the output of ``pypeit_chk_wavecalib`` changed to ``SpatOrderID`` and
   now show the echelle order number, if applicable, otherwise the slit number.
 - ``pypeit_chk_edges`` now load SlitTraceSet (if available) to be able to overlay the echelle order numbers.
+- Added a new GUI for creating and editing PypeIt input files: ``pypeit_setup_gui``
 - Added a -G option to ``pypeit_setup`` and ``pypeit_obslog`` that will start the new
   Setup GUI.
 - Improvements and bug fixes for how the mask is displayed by
@@ -92,9 +92,9 @@ Datamodel Changes
 -----------------
 
 - A wavelength array is now stored for DataCube()
-- Wavecalib and Wavefit datacontainers now store information about echelle order
+- WaveCalib and WaveFit datacontainers now store information about echelle order
   number, if applicable.
-- Change to how Slit datamodel stores and checks bit flag values.
+- Change to how SlitTraceSet datamodel stores and checks bit flag values.
 
 Under-the-hood Improvements
 ---------------------------

doc/whatsnew.rst

@@ -11,7 +11,7 @@ What's New in PypeIt
 
 ----
 
-.. include:: releases/1.14.1dev.rst
+.. include:: releases/1.15.0.rst
 
 ----
 

pypeit/tests/tstutils.py

@@ -37,7 +37,6 @@
 # Tests require the Telluric file (Mauna Kea)
 par = Spectrograph.default_pypeit_par()
 tell_test_grid = data.get_telgrid_filepath('TellPCA_3000_26000_R25000.fits')
-#tell_test_grid = data.Paths.telgrid / 'TelFit_MaunaKea_3100_26100_R20000.fits'
 telluric_required = pytest.mark.skipif(not tell_test_grid.is_file(),
                                        reason='no Mauna Kea telluric file')