Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhandberg committed May 12, 2021
2 parents 3fe40bf + 4c6c726 commit de95018
Show file tree
Hide file tree
Showing 23 changed files with 1,705 additions and 387 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ dmypy.json
.vscode/

# OSX stuff:
.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master-v0.4.9
master-v0.5
3 changes: 2 additions & 1 deletion flows/aadc_db.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Connection to the central AADC database.
Expand All @@ -14,7 +15,7 @@
import getpass
from .config import load_config

#------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------
class AADC_DB(object): # pragma: no cover
"""
Connection to the central TASOC database.
Expand Down
2 changes: 1 addition & 1 deletion flows/api/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,6 @@ def add_target(name, coord, redshift=None, redshift_error=None, discovery_date=N

# Check for errors:
if jsn['errors'] is not None:
raise ValueError("%s" % jsn['errors'])
raise RuntimeError(f"Adding target '{name}' resulted in an error: {jsn['errors']}")

return int(jsn['targetid'])
6 changes: 6 additions & 0 deletions flows/coordinatematch/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# flake8: noqa

from .coordinatematch import CoordinateMatch
from .wcs import WCS2
Loading

0 comments on commit de95018

Please sign in to comment.