streamlines sdss_install_bootstrap and configuration

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.2dev
+current_version = 1.1.0dev
 commit = True
 tag = False
 tag_name = {new_version}

.travis.yml

@@ -4,37 +4,62 @@ cache:
   pip: true
   timeout: 1000
 
-sudo: false
-
 python:
 - '2.7'
 - '3.5'
 - '3.6'
+- '3.7'
 
 os:
 - linux
 
-matrix:
+jobs:
   fast_finish: true
+  allow_failures:
+    - python: '2.7'
+    - os: osx
+  include:
+    - name: "Python 3.7 on macOS"
+      os: osx
+      osx_image:
+        - xcode11.2  # Python 3.7.7 running on macOS 10.14.6
+      language: shell       # 'language: python' is an error on Travis CI macOS
+    - name: "Python 3.6 on macOS"
+      os: osx
+      osx_image:
+        - xcode9.4  # Python 3.6.5 running on macOS 10.13
+      language: shell
 
 notifications:
   email: false
 
 # repo branches to test
 branches:
-- master
+  only:
+  - /.*/
+
+before_install:
+  # installing lmod modules on linux
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -y ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y lmod; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /usr/share/lmod/lmod/init/profile; fi
+  # installing lmod modules on osx
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lmod ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source /usr/local/opt/lmod/init/profile; fi
+
 
 install:
-- pip install -U pip wheel --quiet
-- pip install --upgrade setuptools --quiet
-- pip install -r requirements.txt --quiet
-- pip install pytest
-- pip install pytest-coverage
-- pip install coveralls
-#- python setup.py install 
+- pip3 install -U pip wheel --quiet
+- pip3 install --upgrade setuptools --quiet
+- pip3 install -r requirements.txt --quiet
+- pip3 install pytest
+- pip3 install pytest-coverage
+- pip3 install coveralls
+#- python setup.py install
 
 script:
-- pytest python/sdss_install/tests --cov python/sdss_install --cov-report html
+- pytest --public-svn-only python/sdss_install/tests --cov python/sdss_install --cov-report html
 
 after_success:
 - coveralls

CHANGELOG.rst

@@ -1,32 +1,40 @@
-.. _sdss_install-changelog:
-
-==========
-Change Log
-==========
-
-This document records the main changes to the sdss_install code.
-
-.. _changelog-0.1.0:
-0.1.0 (unreleased)
-------------------
-
-Added
-^^^^^
-* A thing we added.
-
-.. x.y.z (unreleased)
-.. ------------------
-..
-.. A short description
-..
-.. Added
-.. ^^^^^
-.. * TBD
-..
-.. Changed
-.. ^^^^^^^
-.. * TBD
-..
-.. Fixed
-.. ^^^^^
-.. * TBD
+
+Changelog
+=========
+
+This document records the main changes to the ``sdss_install`` code.
+
+* :release:`1.1.0 <unreleased>`
+* :support:`7` Added sphinx documentation for readthedocs
+* :feature:`48` new ``--github-url`` option to optionally set a different public git url
+* :support:`48` Updated changelog
+* :feature:`12` Added new configuration bash sript to aid setup during sdss_install bootstrap
+* :feature:`12` Added new environment variables to customize GIT and SVN product and modulefile locations
+* :feature:`48` Use of custom `sdss_install.yml` config file for loading of parameters and environment variables
+* :feature:`45` New ``--skip-git-verdirs`` option to turn off use of version sub-directories for git repos
+* :support:`48` Initial test suite for better failure tracking and robustness
+* :support:`48` Set up testing on Travis-CI
+* :bug:`48 major` synchronized package version with tag versions
+
+* :release:`1.0.6 <2019-12-09>`
+* :feature:`47` Added new command line option ``--https`` enables the user to use sdss_install with either https or ssh.
+* :bug:`46` - no option for git install from https
+
+* :release:`1.0.5 <2019-11-13>`
+* :feature:`39 backported`  Added support for installation of external dependencies
+
+* :release:`1.0.4 <2019-07-02>`
+* :feature:`42 backported` Added new ``sdss_install_version`` script to check version of the currently checked out Git branch or tag.
+* :feature:`25 backported` Added support for Mac Brew installed modules
+
+* :release:`1.0.3 <2019-05-16>`
+* :feature:`- backported` Added custom `Module(s)` class for improved system handling of module files
+
+* :release:`1.0.2 <2019-05-13>`
+* :feature:`- backported` Implemented subprocessing of git commands for version validation
+* :feature:`29 backported` Grab latest tag of sdss_install during install for robustness
+* :bug:`21` Removed GraphQL implementation of version validation
+
+* :release:`1.0.1 <2019-05-13>`
+* :feature:`-` Initial release of `sdss_install`
+* :feature:`-` GraphQL product/version validation of Github repos

bin/add_to_config.py

@@ -0,0 +1,74 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+# 
+# Filename: add_to_config.py
+# Project: bin
+# Author: Brian Cherinka
+# Created: Monday, 18th November 2019 6:12:06 pm
+# License: BSD 3-clause "New" or "Revised" License
+# Copyright (c) 2019 Brian Cherinka
+# Last Modified: Monday, 18th November 2019 6:57:04 pm
+# Modified By: Brian Cherinka
+
+
+from __future__ import print_function, division, absolute_import
+
+import os
+import sys
+import yaml
+import argparse
+
+
+def update_config(envvars):
+    ''' Update the custom config with environment variables '''
+    data = {row[0]: row[1] for row in envvars}
+
+    custom_config_fn = os.path.expanduser('~/.{0}/{0}.yml'.format('sdss_install'))
+
+    if os.path.exists(custom_config_fn):
+        config = yaml.load(open(custom_config_fn), Loader=yaml.SafeLoader)
+
+        # add the environment variables
+        if 'envs' in config:
+            config['envs'].update(data)
+        else:
+            config['envs'] = data
+
+        # append to the file
+        with open(custom_config_fn, 'w+') as file:
+            yaml.dump(config, file)   
+    else:
+        # write a new custom config
+        dirname = os.path.dirname(custom_config_fn)
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
+        with open(custom_config_fn, 'w') as file:
+            yaml.dump({'envs': data}, file)
+
+
+def parse_args():
+    ''' Parse the arguments '''
+
+    parser = argparse.ArgumentParser(
+        prog='update your custom sdss_install.yaml config file', usage='%(prog)s [opts]')
+    parser.add_argument('-v', '--verbose', action='store_true', dest='verbose',
+                        help='Print extra information.', default=False)
+    parser.add_argument('-e', "--envvars", nargs='*',
+                        type=lambda kv: kv.split("="), dest='envvars', 
+                        help='The environment variables to add to the config file; as key-value pairs')
+    opts = parser.parse_args()
+
+    return opts
+
+
+def main(args):
+
+    # parse arguments
+    opts = parse_args()
+
+    # write to config
+    update_config(opts.envvars)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])