Merge branch 'version-3-0-alpha' into 1459-login-problems-intermittent, resolving merge conflicts

Agent-Logs-Url: https://github.com/TOMToolkit/tom_base/sessions/6528e0d8-184c-4931-a64c-7484b487ba05

Co-authored-by: phycodurus <431350+phycodurus@users.noreply.github.com>

Author: Copilot

docs/_static/dataservices_doc/advanced_form.png

@@ -1,5 +1,9 @@
 Forms
 =====
 
+ .. WARNING::
+  
+  `tom_catalogs` is deprecated as of version 3.0 and has bene replaced by :doc:`tom_dataservices <../tom_dataservices/index>`.
+
 .. automodule:: tom_catalogs.forms
     :members:

docs/_static/dataservices_doc/query_form_collapsed.png

@@ -1,6 +1,10 @@
 Harvesters
 ==========
 
+ .. WARNING::
+  
+  `tom_catalogs` is deprecated as of version 3.0 and has bene replaced by :doc:`tom_dataservices <../tom_dataservices/index>`.
+
 ********************
 Base Harvester Class
 ********************

docs/api/tom_catalogs/forms.rst

@@ -1,6 +1,10 @@
 Catalogs
 ========
 
+ .. WARNING::
+  
+  This package is deprecated as of version 3.0 and has bene replaced by :doc:`tom_dataservices <../tom_dataservices/index>`.
+
 .. toctree::
   :maxdepth: 2
 

docs/api/tom_catalogs/harvesters.rst

@@ -1,5 +1,9 @@
 Views
 =====
 
+ .. WARNING::
+  
+  `tom_catalogs` is deprecated as of version 3.0 and has bene replaced by :doc:`tom_dataservices <../tom_dataservices/index>`.
+
 .. automodule:: tom_catalogs.views
     :members:

docs/api/tom_catalogs/index.rst

@@ -11,9 +11,9 @@ The ``DataProductUploadView`` calls ``run_data_processor`` upon saving the ``Dat
 instantiates the ``DATA_PROCESSOR_CLASS``, which can be specified in ``settings.py``. ``run_data_processor`` then
 processes the uploaded ``DataProduct`` based on the tag value, which can either be Photometry or Spectroscopy.
 
-In the case of spectra, the default behavior is that ``DataProduct`` is converted into a ``specutils.Spectrum1D`` from
+In the case of spectra, the default behavior is that ``DataProduct`` is converted into a ``specutils.Spectrum`` from
 either a CSV or a FITS file. The spectrum is multiplied by the flux constant of the facility it was taken at, or not
-multiplied. The ``Spectrum1D`` is then serialized into JSON for database via the ``SpectrumSerializer``.
+multiplied. The ``Spectrum`` is then serialized into JSON for database via the ``SpectrumSerializer``.
 
 For photometry, the default behavior is simply to read the CSV and convert it to JSON for database storage.
 

docs/api/tom_catalogs/views.rst

@@ -166,7 +166,7 @@ Default: []
 
 With an `AUTH_STRATEGY <#auth-strategy>`__ value of **LOCKED**, urls in
 this list will remain visible to unauthenticated users. You can also use wild cards to open an entire path.
-You might add the homepage (‘/’), for example, or anything with a path that looks like '/accounts/reset/*/'.
+You might add the homepage (‘/’), for example, or anything with a path that looks like ``'/accounts/reset/*/'``.
 
 `TARGET_PERMISSIONS_ONLY <#target-permissions-only>`__
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -260,25 +260,6 @@ A list of observation facility classes to make available to your TOM. If
 you have written or downloaded a custom observation facility you would
 add the class to this list to make your TOM load it.
 
-`TOM_HARVESTER_CLASSES <#tom-harvester-classes>`__
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Default:
-
-.. code-block
-
-   [
-       'tom_catalogs.harvesters.simbad.SimbadHarvester',
-       'tom_catalogs.harvesters.ned.NEDHarvester',
-       'tom_catalogs.harvesters.jplhorizons.JPLHorizonsHarvester',
-       'tom_catalogs.harvesters.mpc.MPCHarvester',
-       'tom_catalogs.harvesters.tns.TNSHarvester',
-   ]
-
-A list of TOM harverster classes to make available to your TOM. If you
-have written or downloaded additional harvester classes you would make
-them available here.
-
 `TOM_LATEX_PROCESSORS <#tom-latex-processors>`__
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/api/tom_dataproducts/data_processing.md

@@ -181,7 +181,7 @@ Editing this file will allow you to overwrite any of the css used at the base le
 styling established by TOMToolkit themes such as "Dark Mode".
 
 The TOMToolkit has several built in variables that allow you to establish a theme for your TOM. You can see these in
-`root` dictionay in yoyr ``custom.css``. Altering these will change the appearance of large portions of the website.
+`root` dictionary in your ``custom.css``. Altering these will change the appearance of large portions of the website.
 
 As an example, let's change the background color from white (#ffffff) to an off-white (#efead6).
 Add the following in your ``custom.css`` after the comments: