Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dhomeier/specviz
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: spacetelescope/specviz
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 153 additions and 66,454 deletions.
  1. +2 −1 .gitignore
  2. +0 −3 .gitmodules
  3. +0 −8 .rtd-environment.yml
  4. +0 −154 .travis.yml
  5. +1 −1 {licenses → }/LICENSE.rst
  6. +2 −30 MANIFEST.in
  7. +0 −19 README.md
  8. +25 −0 README.rst
  9. +0 −1,000 ah_bootstrap.py
  10. +0 −52 appveyor.yml
  11. +0 −1 astropy_helpers
  12. +1 −1 docs/Makefile
  13. BIN docs/_static/demo.png
  14. BIN docs/_static/stsci_logo.png
  15. BIN docs/_static/viewer.png
  16. +0 −2 docs/_templates/autosummary/base.rst
  17. +0 −2 docs/_templates/autosummary/class.rst
  18. +0 −2 docs/_templates/autosummary/module.rst
  19. +0 −66 docs/api.rst
  20. +49 −19 docs/conf.py
  21. +0 −412 docs/custom_loaders.rst
  22. +11 −71 docs/index.rst
  23. +0 −146 docs/installation.rst
  24. +0 −20 docs/launching.rst
  25. +0 −242 docs/model_fitting.rst
  26. +0 −85 docs/viewer.rst
  27. +0 −436 ez_setup.py
  28. +0 −5 licenses/README.rst
  29. +2 −0 pyproject.toml
  30. +18 −5 readthedocs.yml
  31. +24 −18 setup.cfg
  32. +1 −151 setup.py
  33. +9 −23 specviz/__init__.py
  34. +0 −143 specviz/_astropy_init.py
  35. +0 −5 specviz/analysis/__init__.py
  36. +0 −42 specviz/analysis/filters.py
  37. +0 −4 specviz/analysis/models/__init__.py
  38. +0 −93 specviz/analysis/models/blackbody.py
  39. +0 −99 specviz/analysis/models/gaussian_absorption.py
  40. +0 −74 specviz/analysis/models/spline.py
  41. +0 −64 specviz/analysis/operations.py
  42. +0 −245 specviz/analysis/statistics.py
  43. 0 specviz/analysis/tests/__init__.py
  44. +0 −17 specviz/analysis/tests/test_statistics.py
  45. +0 −209 specviz/analysis/utils.py
  46. +0 −227 specviz/app.py
  47. +0 −38 specviz/conftest.py
  48. +0 −1 specviz/core/__init__.py
  49. +0 −65 specviz/core/annotation.py
  50. +0 −579 specviz/core/data.py
  51. +0 −190 specviz/core/dispatch.py
  52. +0 −73 specviz/core/events.py
  53. +0 −213 specviz/core/linelist.py
  54. +0 −368 specviz/core/plots.py
  55. +0 −296 specviz/core/threads.py
  56. +0 −55 specviz/data/linelists/Common_nebular.txt
  57. +0 −17 specviz/data/linelists/Common_nebular.yaml
  58. +0 −99 specviz/data/linelists/Common_stellar.txt
  59. +0 −17 specviz/data/linelists/Common_stellar.yaml
  60. +0 −46,670 specviz/data/linelists/Reader-Corliss.txt
  61. +0 −25 specviz/data/linelists/Reader-Corliss.yaml
  62. +0 −38 specviz/data/mask_definitions/jwst.ecsv
  63. +0 −34 specviz/data/mask_definitions/sdss.ecsv
  64. BIN specviz/data/qt/resources/Average Math-48.png
  65. BIN specviz/data/qt/resources/Average Value-48.png
  66. BIN specviz/data/qt/resources/Change Theme-50.png
  67. BIN specviz/data/qt/resources/Color Dropper-48.png
  68. BIN specviz/data/qt/resources/Combo Chart-48.png
  69. BIN specviz/data/qt/resources/Copy-96.png
  70. BIN specviz/data/qt/resources/Delete-48.png
  71. BIN specviz/data/qt/resources/Ellipse Stroked-50.png
  72. BIN specviz/data/qt/resources/Export-48.png
  73. BIN specviz/data/qt/resources/Generic Text-48.png
  74. BIN specviz/data/qt/resources/Globe Earth-48.png
  75. BIN specviz/data/qt/resources/Label-48.png
  76. BIN specviz/data/qt/resources/Line Chart-48.png
  77. BIN specviz/data/qt/resources/Math-48.png
  78. BIN specviz/data/qt/resources/Merge Vertical-48.png
  79. BIN specviz/data/qt/resources/Open Folder-48.png
  80. BIN specviz/data/qt/resources/Open Folder-Wizard-48.png
  81. BIN specviz/data/qt/resources/Open in Browser-50.png
  82. BIN specviz/data/qt/resources/Paste-96.png
  83. BIN specviz/data/qt/resources/Pentagon-50.png
  84. BIN specviz/data/qt/resources/Rectangle Stroked-50.png
  85. BIN specviz/data/qt/resources/Remove Image-50.png
  86. BIN specviz/data/qt/resources/Ruler-48.png
  87. BIN specviz/data/qt/resources/Save-48.png
  88. BIN specviz/data/qt/resources/Settings 3-50.png
  89. BIN specviz/data/qt/resources/Settings-50.png
  90. BIN specviz/data/qt/resources/Split Horizontal-48.png
  91. BIN specviz/data/qt/resources/Stanley Knife-48.png
  92. BIN specviz/data/qt/resources/Template-50.png
  93. BIN specviz/data/qt/resources/Theatre Mask-48.png
  94. BIN specviz/data/qt/resources/Vertical Flag-48.png
  95. BIN specviz/data/qt/resources/Width-48.png
  96. BIN specviz/data/qt/resources/application/icon.png
  97. BIN specviz/data/qt/resources/icons8-Attention-528.png
  98. BIN specviz/data/qt/resources/icons8-Expand Arrow-96.png
  99. BIN specviz/data/qt/resources/icons8-Forward-96.png
  100. BIN specviz/data/qt/resources/icons8-New Window-96.png
  101. BIN specviz/data/qt/resources/icons8-Open in Window-96.png
  102. +0 −50 specviz/data/qt/resources/lock.svg
  103. +0 −44 specviz/data/qt/resources/resources.qrc
  104. +0 −50 specviz/data/qt/resources/unlock.svg
  105. +0 −134 specviz/data/qt/ui/data_list_plugin.ui
  106. +0 −148 specviz/data/qt/ui/dialog_resample_warning.ui
  107. +0 −105 specviz/data/qt/ui/fitted_linemap_dialog.ui
  108. +0 −81 specviz/data/qt/ui/fitted_linemap_prog_dialog.ui
  109. +0 −187 specviz/data/qt/ui/layer_list_plugin.ui
  110. +0 −78 specviz/data/qt/ui/main_window.ui
  111. +0 −361 specviz/data/qt/ui/model_fitting_plugin.ui
  112. +0 −78 specviz/data/qt/ui/no_model_error_dialog.ui
  113. +0 −111 specviz/data/qt/ui/parameter_tie_dialog.ui
  114. +0 −48 specviz/data/qt/ui/plugin.ui
  115. +0 −88 specviz/data/qt/ui/roi_bounds_dialog.ui
  116. +0 −382 specviz/data/qt/ui/statistics_plugin.ui
  117. +0 −653 specviz/data/qt/ui/wizard.ui
  118. +0 −14 specviz/data/yaml_loaders/ascii.yaml
  119. +0 −14 specviz/data/yaml_loaders/generic.yaml
  120. +0 −18 specviz/data/yaml_loaders/keck_deimos.yaml
  121. +0 −19 specviz/data/yaml_loaders/keck_mosfire.yaml
  122. +0 −16 specviz/data/yaml_loaders/kittpeak_mdm.yaml
  123. +0 −3 specviz/interfaces/__init__.py
  124. +0 −93 specviz/interfaces/decorators.py
  125. +0 −135 specviz/interfaces/factories.py
  126. +0 −306 specviz/interfaces/initializers.py
  127. +0 −149 specviz/interfaces/loaders.py
  128. +0 −1 specviz/interfaces/model_io/__init__.py
  129. +0 −377 specviz/interfaces/model_io/py_model_io.py
  130. +0 −532 specviz/interfaces/model_io/yaml_model_io.py
  131. +0 −64 specviz/interfaces/registries.py
  132. +0 −1 specviz/io/__init__.py
  133. +0 −5 specviz/io/loaders/__init__.py
  134. +0 −174 specviz/io/loaders/apogee_loader.py
  135. +0 −87 specviz/io/loaders/generic_loader.py
  136. +0 −56 specviz/io/loaders/hstcos_loader.py
  137. +0 −56 specviz/io/loaders/hststis_loader.py
  138. +0 −125 specviz/io/loaders/sdss_loader.py
  139. +0 −458 specviz/io/yaml_loader.py
  140. +0 −7 specviz/plugins/__init__.py
  141. +0 −231 specviz/plugins/data_list_plugin.py
  142. +0 −458 specviz/plugins/layer_list_plugin.py
  143. +0 −173 specviz/plugins/mask_editor_plugin.py
  144. +0 −654 specviz/plugins/model_fitting_plugin.py
  145. +0 −159 specviz/plugins/plot_tools_plugin.py
  146. +0 −128 specviz/plugins/statistics_plugin.py
  147. +0 −115 specviz/plugins/tool_tray_plugin.py
  148. +8 −0 specviz/retired.py
  149. +0 −4 specviz/tests/__init__.py
  150. +0 −31 specviz/tests/coveragerc
  151. +0 −3 specviz/tests/setup_package.py
  152. 0 specviz/third_party/__init__.py
  153. 0 specviz/third_party/glue/__init__.py
  154. +0 −486 specviz/third_party/glue/data_viewer.py
  155. +0 −37 specviz/third_party/glue/layer_widget.py
  156. +0 −50 specviz/third_party/glue/layer_widget.ui
  157. +0 −32 specviz/third_party/glue/plugins.py
  158. +0 −1 specviz/third_party/glue/version.py
  159. +0 −30 specviz/third_party/glue/viewer_options.py
  160. +0 −50 specviz/third_party/glue/viewer_options.ui
  161. +0 −4 specviz/utils/__init__.py
  162. +0 −122 specviz/utils/parse_fits.py
  163. 0 specviz/utils/tests/__init__.py
  164. 0 specviz/widgets/__init__.py
  165. +0 −106 specviz/widgets/axes.py
  166. +0 −459 specviz/widgets/dialogs.py
  167. +0 −273 specviz/widgets/linelists_window.py
  168. +0 −36 specviz/widgets/menus.py
  169. +0 −154 specviz/widgets/plugin.py
  170. 0 specviz/widgets/qt_plugins/__init__.py
  171. +0 −55 specviz/widgets/qt_plugins/spoiler_plugin.py
  172. +0 −86 specviz/widgets/region_items.py
  173. +0 −2,802 specviz/widgets/resources.py
  174. +0 −77 specviz/widgets/spoiler.py
  175. +0 −617 specviz/widgets/sub_windows.py
  176. +0 −40 specviz/widgets/toolbars.py
  177. +0 −20 specviz/widgets/utils.py
  178. +0 −96 specviz/widgets/windows.py
  179. +0 −582 specviz/widgets/wizard.py
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -55,7 +55,8 @@ distribute-*.tar.gz
.project
.pydevproject
.settings
.vscode
.pytest_cache

# Mac OSX
.DS_Store
.vscode
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

8 changes: 0 additions & 8 deletions .rtd-environment.yml

This file was deleted.

154 changes: 0 additions & 154 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion licenses/LICENSE.rst → LICENSE.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) year, JDADF Developers
Copyright (c) 2018-2021, JDADF Developers
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
32 changes: 2 additions & 30 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,41 +1,13 @@
include README.rst
include CHANGES.rst
include LICENSE.rst

include ez_setup.py
include ah_bootstrap.py
include pyproject.toml
include setup.cfg
include specviz/tests/coveragerc

recursive-include specviz *.pyx *.c *.pxd
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
recursive-include scripts *

prune build
prune docs/_build
prune docs/api


# the next few stanzas are for astropy_helpers. It's derived from the
# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
# package directory and egg-info.

include astropy_helpers/README.rst
include astropy_helpers/CHANGES.rst
include astropy_helpers/LICENSE.rst
recursive-include astropy_helpers/licenses *

include astropy_helpers/ez_setup.py
include astropy_helpers/ah_bootstrap.py

recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h
recursive-include astropy_helpers/astropy_helpers.egg-info *
# include the sphinx stuff with "*" because there are css/html/rst/etc.
recursive-include astropy_helpers/astropy_helpers/sphinx *

prune astropy_helpers/build
prune astropy_helpers/astropy_helpers/tests


global-exclude *.pyc *.o
19 changes: 0 additions & 19 deletions README.md

This file was deleted.

25 changes: 25 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
SpecViz: An interactive astronomical 1D spectra analysis tool
=============================================================

An GUI-based interactive analysis tool for one dimensional astronomical data
using Python.

For documentation see https://specviz.readthedocs.io/en/latest/

Current Status
--------------

Please note that this version of SpecViz is **no longer being actively supported
or maintained**. The functionality of SpecViz is now available and being actively
developed as part of `Jdaviz <https://github.com/spacetelescope/jdaviz>`_.

If you must use legacy SpecViz, please try v0.7.1 in Python 3.6.

License
-------

This project is Copyright (c) JDADF Developers and licensed under
the terms of the BSD 3-Clause license. This package is based upon
the `Astropy package template <https://github.com/astropy/package-template>`_
which is licensed under the BSD 3-clause licence. See the licenses folder for
more information.
Loading