Skip to content

Commit

Permalink
Merge pull request #234 from simontorres/rename_project
Browse files Browse the repository at this point in the history
Finished first stage of project renaming, all test successful.
  • Loading branch information
Simon Torres committed Oct 2, 2018
2 parents c70e535 + 3916197 commit f6ccc9a
Show file tree
Hide file tree
Showing 150 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ before_install:


install:
- export PATH="$PATH:$HOME/build/soar-telescope/goodman/dcrbin"
- export PATH="$PATH:$HOME/build/soar-telescope/goodman_pipeline/dcrbin"

- sudo apt-get update

Expand All @@ -37,7 +37,7 @@ install:

# Create astroconda virtual environment
- conda env create -q python=$TRAVIS_PYTHON_VERSION -f environment.yml
- source activate goodman
- source activate goodman_pipeline

# install
- python setup.py test
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Goodman High Throughput Spectrograph Data Reduction Pipeline

[![Build Status](https://travis-ci.org/soar-telescope/goodman.svg?branch=master)](https://travis-ci.org/soar-telescope/goodman)
[![Coverage Status](https://coveralls.io/repos/github/soar-telescope/goodman/badge.svg?branch=master)](https://coveralls.io/github/soar-telescope/goodman?branch=master)
[![Build Status](https://travis-ci.org/soar-telescope/goodman_pipeline.svg?branch=master)](https://travis-ci.org/soar-telescope/goodman_pipeline)
[![Coverage Status](https://coveralls.io/repos/github/soar-telescope/goodman_pipeline/badge.svg?branch=master)](https://coveralls.io/github/soar-telescope/goodman_pipeline?branch=master)
[![Documentation Status](https://readthedocs.org/projects/goodman/badge/?version=latest)](http://goodman.readthedocs.io/en/latest/?badge=latest)
[![astropy](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)](http://www.astropy.org/)

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.

__version__ = __import__('pipeline').__version__
__version__ = __import__('goodman_pipeline').__version__

extensions = ['sphinx.ext.todo',
'sphinx.ext.coverage',
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
Welcome to the Goodman HTS Pipeline Documentation
=================================================

.. image:: https://travis-ci.org/soar-telescope/goodman.svg?branch=master
:target: https://travis-ci.org/soar-telescope/goodman
.. image:: https://coveralls.io/repos/github/soar-telescope/goodman/badge.svg?branch=master
:target: https://coveralls.io/github/soar-telescope/goodman?branch=master
.. image:: https://travis-ci.org/soar-telescope/goodman_pipeline.svg?branch=master
:target: https://travis-ci.org/soar-telescope/goodman_pipeline
.. image:: https://coveralls.io/repos/github/soar-telescope/goodman_pipeline/badge.svg?branch=master
:target: https://coveralls.io/github/soar-telescope/goodman_pipeline?branch=master
.. image:: https://readthedocs.org/projects/goodman/badge/?version=latest
:target: http://goodman.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: goodman
name: goodman_pipeline
channels:
- astroconda
dependencies:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions pipeline/core/core.py → goodman_pipeline/core/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

from . import check_version

__version__ = __import__('pipeline').__version__
__version__ = __import__('goodman_pipeline').__version__

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -2731,8 +2731,9 @@ def _load_nist_list(self, **kwargs):
"""Load all csv files from strong lines in NIST."""
nist_path = kwargs.get(
'path',
os.path.join(os.path.dirname(sys.modules['pipeline'].__file__),
'data/nist_list'))
os.path.join(os.path.dirname(
sys.modules['goodman_pipeline'].__file__),
'data/nist_list'))
assert os.path.isdir(nist_path)
nist_files = glob.glob(os.path.join(nist_path, "*.txt"))
for nist_file in nist_files:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import unittest

from pipeline.core import check_version
from goodman_pipeline.core import check_version

__version__ = __import__('pipeline').__version__
__version__ = __import__('goodman_pipeline').__version__


class TestVersionChecker(unittest.TestCase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def setUp(self):
# expected master flat to be retrieved by get_best_flat
self.reference_flat_name = 'master_flat_1200m2_0.84_dome.fits'
# location of sample flats
self.flat_path = 'pipeline/data/test_data/master_flat'
self.flat_path = 'goodman_pipeline/data/test_data/master_flat'
slit = re.sub('[A-Za-z" ]',
'',
self.master_flat.header['SLIT'])
Expand Down Expand Up @@ -616,7 +616,8 @@ class ReferenceDataTest(TestCase):

def setUp(self):
self.rd = ReferenceData(
reference_dir=os.path.join(os.getcwd(), 'pipeline/data/ref_comp'))
reference_dir=os.path.join(os.getcwd(),
'goodman_pipeline/data/ref_comp'))
self.ccd = CCDData(data=np.ones((800, 2000)),
meta=fits.Header(),
unit='adu')
Expand Down
Loading

0 comments on commit f6ccc9a

Please sign in to comment.