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

Changes after release #252

Merged
merged 4 commits into from
Oct 29, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/change_history.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Change History
##############

.. _v1.2.1:

V1.2.1 Unreleased
^^^^^^^^^^^^^^^^^

- Install instructions updated

.. _v1.2.0:

V1.2.0 26-10-2018
Expand Down
7 changes: 5 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ This installation was tested on MacOS High Sierra.
Common Steps
************

.. warning::

This installation instructions work with **BASH** only.

1. Install Miniconda

``bash miniconda.sh``
Expand Down Expand Up @@ -93,8 +97,7 @@ Common Steps

``sh install_dcr.sh``

To test if it worked you can close and reopen the terminal or do ``source ~/.bashrc``
or ``source ~/.bash_profile`` and then.
To test if it worked you can do:


``dcr``
Expand Down
2 changes: 1 addition & 1 deletion goodman_pipeline/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This is an automatic generated file please do not edit
__version__ = '1.2.0'
__version__ = '1.2.1.dev0'
8 changes: 8 additions & 0 deletions install_dcr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ else
ENV_NAME=$(conda info | grep 'active environment' | sed 's/\<active environment\>//g' | sed "s/[: ]//g")
ENV_PATH=$(conda info | grep 'active env location' | sed 's/\<active env location\>//g' | sed "s/[: ]//g")
echo "Using Virtual Environment: " $ENV_NAME
echo "Environment path information: " $ENV_PATH
if [ -d $SOURCE_DIR ]
then
echo "Compiling dcr"
Expand All @@ -30,6 +31,13 @@ else
else
echo "Directory does not exist: " $ENV_PATH
fi

if [ -f $ENV_PATH/bin/dcr ]
then
echo "DCR Installed Successfully on: " $ENV_PATH/bin
else
echo "DCR installation failed"
fi
else
echo "Unable to find compiled file"
fi
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ edit_on_github = False
github_project = soar-telescope/goodman_pipeline
# install_requires = astropy six gwcs scipy
# version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
version = 1.2.0
version = 1.2.1.dev0