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

Small fix for PCAD table generation + SCM version changes #213

Merged
merged 3 commits into from
Jan 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
5 changes: 4 additions & 1 deletion mica/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
__version__ = '4.19'

import ska_helpers

__version__ = ska_helpers.get_version(__package__)


def test(*args, **kwargs):
Expand Down
8 changes: 7 additions & 1 deletion mica/web/pcad_table.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from kadi import events

import kadi.events.query as events
# This import style (instead of "from kadi import events") is required due to a
# conflict with how the django app is initialized and standalone usage since
# django 2+. Basically `events/__init__.py` in a django app does not get the
# auto-generated query references because DJANGO_SETTINGS_MODULE is set.

import numpy as np
from Chandra.Time import DateTime
from Ska.engarchive import fetch
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
from setuptools import setup
from pathlib import Path

from mica import __version__

try:
from testr.setup_helper import cmdclass
except ImportError:
Expand All @@ -32,7 +30,8 @@

setup(name='mica',
description='Mica aspects archive',
version=__version__,
use_scm_version=True,
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
author='Jean Connelly',
author_email='jconnelly@cfa.harvard.edu',
license=license,
Expand Down