Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Db monitor #52

Merged
merged 39 commits into from
May 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
72a877d
Added functions to query MAST for record counts and data.
hover2pi Apr 2, 2018
b52a0c5
Generates table of result counts
hover2pi Apr 2, 2018
9a363a5
PEP8 compliance.
hover2pi Apr 2, 2018
39a945d
Added total db counts
hover2pi Apr 2, 2018
7ad6e74
Added total db counts comment
hover2pi Apr 2, 2018
61f16f9
Added keyword count to jwst_inventory()
hover2pi Apr 2, 2018
c4324a1
Added some more acknowledgements
bourque Apr 16, 2018
ef7c148
Add Joe Hunkeler's filename parser to utils.py with minor modifications
Apr 16, 2018
f55f25f
Update references/authors
Apr 16, 2018
86cd388
first pass at getting sphinx and automodapi running, not storing auto…
SaOgaz Apr 4, 2018
b700d07
Adding readthedocs files, issue #51
SaOgaz Apr 4, 2018
cf5c37a
deleting these rtd files for now, rtd will not run on a private repo
SaOgaz Apr 4, 2018
aa88a23
Updated environment file and a small conf tweak.
SaOgaz Apr 4, 2018
d95d028
Merge pull request #53 from SaraOgaz/sphinx_setup
bourque Apr 17, 2018
b31cdf7
Create simply pytests for utils.get_config and utils.filename_parser
Apr 18, 2018
f865a2e
Updating docstrings, etc.
Apr 18, 2018
72513a3
Removed some extra lines
bourque Apr 19, 2018
4130d96
Minor formatting changes
bourque Apr 19, 2018
f69948c
Merge pull request #63 from laurenmarietta/filename_parser
bourque Apr 19, 2018
8f914ab
Moved global lists to utils.py and removed POST calls.
hover2pi Apr 25, 2018
087fde4
Added CAOM functions and non-CAOM functions.
hover2pi Apr 25, 2018
72d8e7b
Added donut plot.
hover2pi Apr 25, 2018
e5f1282
Tidying up the inventory functions.
hover2pi May 2, 2018
4b6f6e8
PEP8 compliance.
hover2pi May 2, 2018
3194f34
Merge conflicts.
hover2pi May 2, 2018
b00f7c5
Updated the module docstring to render more nicely in the API docs
bourque May 4, 2018
92761dc
Fixed dbmonitor to accept filters and broke out keyword queries.
hover2pi May 11, 2018
81c4e59
Merge branch 'db_monitor' of https://github.com/hover2pi/jwql into db…
hover2pi May 11, 2018
c899d1e
Combined CAOM and filtered service queries.
hover2pi May 23, 2018
59ef757
Removed duplicate global variables
hover2pi May 23, 2018
b247a38
PEP 8
hover2pi May 23, 2018
e0e735e
Started adding tests.
hover2pi May 23, 2018
6ce1f2d
Formatting docstring.
hover2pi May 23, 2018
bcfe728
Added a few unittests.
hover2pi May 29, 2018
1b87971
Fixed my name in the README
hover2pi May 29, 2018
8ce3800
Saving the plot to the jwql central storage area instead of just show…
bourque May 31, 2018
c109a57
Added call to set_permissions for setting the permissions for the out…
bourque May 31, 2018
d2f6337
Added bokeh to list of requires.
bourque May 31, 2018
0cf6175
Added astroquery dependency
bourque May 31, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
utils/config.json
build/
dist/
jwql.egg-info/
jwql.egg-info/
docs/build/
docs/source/api/
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ The following is a bare bones example of a best work flow for contributing to th
10. Delete your local copy of your branch.


## Git Ignore
## `gitignore`

The `jwql` repository also contains a file named `.gitignore` that indicates specific directories, files or file types that should not be commited to the repository. Feel free to add additional lines to this file if you want to avoid committing anything. Some examples may include `.fits` files, `.jpeg` files, or `.ipynb_checkpoints/`.

Expand All @@ -86,7 +86,7 @@ Any questions about the `jwql` project or its software can be directed to `jwql@
- Matthew Bourque (INS)
- Lauren Chambers (INS)
- Misty Cracraft (INS)
- Joseph Filippazo (INS)
- Joe Filippazzo (INS)
- Bryan Hilbert (INS)
- Graham Kanarek (INS)
- Catherine Martlin (INS)
Expand All @@ -109,6 +109,7 @@ Any questions about the `jwql` project or its software can be directed to `jwql@
- Phil Grant (ITSD)
- Dean Hines (INS)
- Sherrie Holfeltz (INS)
- Joe Hunkeler (OED)
- Catherine Kaleida (OED)
- Mark Kyprianou (OED)
- Karen Levay (OED)
Expand All @@ -125,4 +126,5 @@ Any questions about the `jwql` project or its software can be directed to `jwql@
- Linda Smith (INS)
- Dave Unger (ITSD)
- Jeff Valenti (INS)
- Lara Wilkinson (OPO)
- Joe Zahn (ITSD)
20 changes: 20 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXPROJ = jwql
SOURCEDIR = source
BUILDDIR = build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
7 changes: 7 additions & 0 deletions docs/source/api_docs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Preview Image Test
==================
.. automodapi:: jwql.preview_image.preview_image

Utils Test
==========
.. automodapi:: jwql.utils.utils
173 changes: 173 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# jwql documentation build configuration file, created by
# sphinx-quickstart on Wed Apr 4 10:30:20 2018.
#
# This file is execfile()d with the current directory set to its
# containing dir.
#
# Note that not all possible configuration values are present in this
# autogenerated file.
#
# All configuration values have a default; values that are commented out
# serve to show the default.

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
import stsci_rtd_theme

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
#
# needs_sphinx = '1.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['sphinx_automodapi.automodapi',
'sphinx_automodapi.automodsumm',
'numpydoc',
'sphinx.ext.autodoc',
'sphinx.ext.mathjax',
'sphinx.ext.viewcode']

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
#
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'

# The master toctree document.
master_doc = 'index'

# Numpy doc setting, right now this supresses some warnings, not exactly sure why?
numpydoc_show_class_members = False

# General information about the project.
project = 'jwql'
copyright = '2018, STScI'
author = 'STScI'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.4.1'
# The full version, including alpha/beta/rc tags.
release = '0.4.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = []

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = False


# -- Options for HTML output ----------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'stsci_rtd_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#
# html_theme_options = {}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_theme_path = [stsci_rtd_theme.get_html_theme_path()]

# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
#
# This is required for the alabaster theme
# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
#html_sidebars = {}


# -- Options for HTMLHelp output ------------------------------------------

# Output file base name for HTML help builder.
htmlhelp_basename = 'jwqldoc'


# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'jwql.tex', 'jwql Documentation',
'STScI', 'manual'),
]


# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'jwql', 'jwql Documentation',
[author], 1)
]


# -- Options for Texinfo output -------------------------------------------

# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'jwql', 'jwql Documentation',
author, 'jwql', 'One line description of project.',
'Miscellaneous'),
]



30 changes: 30 additions & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.. jwql documentation master file, created by
sphinx-quickstart on Wed Apr 4 10:30:20 2018.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

Welcome to jwql's documentation!
================================

General JWQL description here.

.. toctree::
:maxdepth: 2
:caption: Contents:

API documentation
=================

.. toctree::
:maxdepth: 1
:caption: Contents:

api_docs.rst


Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
5 changes: 5 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ channels:
- http://ssb.stsci.edu/astroconda-dev
dependencies:
- astropy=3.0
- astroquery=0.3.8
- bokeh=0.12.5
- django=1.11.8
- jwst=0.7.8rc9
- matplotlib=2.1.1
- numpy=1.14.0
- numpydoc=0.8.0
- postgresql=9.6.6
- python=3.6.4
- python-dateutil=2.6.1
- sphinx=1.6.6
- sphinx_rtd_theme=0.1.9
- sqlalchemy=1.2.0
- stsci_rtd_theme=0.0.1
- pip:
- sphinx-automodapi==0.7
1 change: 1 addition & 0 deletions jwql/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import dbmonitor
Empty file added jwql/dbmonitor/__init__.py
Empty file.
Loading