bline cookiecutter update

.gitlab-ci.yml

+image: python
+
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
+
+# Pip's cache doesn't store the python packages
+# https://pip.pypa.io/en/stable/reference/pip_install/#caching
+#
+# If you want to also cache the installed packages, you have to install
+# them in a virtualenv and cache it as well.
+cache:
+  paths:
+    - .cache/pip
+
+stages:
+- test
+
+before_script:
+- pip install -e .[dev]
+
+
+python2:
+  image: python:2.7
+  tags:
+  - passoft
+  stage: test
+  script: tox -e py27
+
+python3:
+  image: python:3.6
+  tags:
+  - passoft
+  stage: test
+  script: tox -e py36

CONTRIBUTING.rst

@@ -32,7 +32,7 @@ wanted" is open to whoever wants to implement it.
 Implement Features
 ~~~~~~~~~~~~~~~~~~
 
-Look through the GitHub issues for features. Anything tagged with "enhancement"
+Look through the GitLab issues for features. Anything tagged with "enhancement"
 and "help wanted" is open to whoever wants to implement it.
 
 Write Documentation
@@ -65,7 +65,7 @@ Ready to contribute? Here's how to set up `bline` for local development.
 
 3. Install your local copy::
 
-    $ python setup.py develop
+    $ pip install -e .[dev]
 
 4. Create a branch for local development::
 
@@ -88,10 +88,10 @@ Ready to contribute? Here's how to set up `bline` for local development.
 Pull Request Guidelines
 -----------------------
 
-Before you submit a pull request, check that it meets these guidelines:
+Before you submit a merge request, check that it meets these guidelines:
 
-1. The pull request should include tests.
-2. If the pull request adds functionality, the docs should be updated. Put
+1. The merge request should include tests.
+2. If the merge request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
 3. The pull request should work for Python 2.7

HISTORY.rst

@@ -2,7 +2,7 @@
 History
 =======
 
-2017.006 (2018-05-18)
+2018.135 (2018-06-07)
 ------------------
 
 * First release on new build system.

README.rst

@@ -18,7 +18,7 @@ Features
 Credits
 -------
 
-This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
+This package was created with Cookiecutter_ and the `passoft/cookiecutter`_ project template.
 
 .. _Cookiecutter: https://github.com/audreyr/cookiecutter
-.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
+.. _`passoft/cookiecutter`: https://git.passcal.nmt.edu/passoft/cookiecutter

bline/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """IRIS PASSCAL"""
 __email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2017.006'
+__version__ = '2018.135'

bline/bline

-#!/usr/bin/env bash
-#    Launch bline.py
-
-if [ ! -z "${PASSCAL}" ]
-then
-   PYTHON=${PASSCAL}/other/bin/picpython
-   export PYTHON
-   PYTHONPATH=${PASSCAL}/lib/python/bline
-   export PYTHONPATH
-else
-   echo "PASSCAL environment variable not set! Cannot continue."
-   exit 1
-fi
-
-if [ ! -e "$PYTHON" ]
-then
-	echo "$PYTHON not found! PyPASSCAL is required. Make sure picpython is in your path variable"
-	exit
-fi
-
-if [ $# = 0 ]
-then
-   echo "Starting bline..."
-   ${PYTHON} ${PASSCAL}/lib/python/bline/bline.py $* &
-   exit 0
-fi
-if [ $1 = "-#" ]
-then
-   ${PYTHON} ${PASSCAL}/lib/python/bline/bline.py $*
-   exit 0
-fi
-echo "Starting bline..."
-${PYTHON} ${PASSCAL}/lib/python/bline/bline.py $* &

conda.recipe/meta.yaml

+package:
+  name: bline
+  version: 2018.135
+
+source:
+  path: ..
+
+build:
+  # If the installation is complex, or different between Unix and Windows, use
+  # separate bld.bat and build.sh files instead of this key.  Add the line
+  # "skip: True  # [py<35]" (for example) to limit to Python 3.5 and newer, or
+  # "skip: True  # [not win]" to limit to Windows.
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
+requirements:
+  build:
+    - python
+    - setuptools
+  run:
+    - python
+
+about:
+  home: https://git.passcal.nmt.edu/passoft/bline
+  summary: Download data from Baler14.

requirements_dev.txt

-pip==9.0.1
-bumpversion==0.5.3
-wheel==0.30.0
-watchdog==0.8.3
-flake8==3.5.0
-tox==2.9.1
-coverage==4.5.1
-Sphinx==1.7.1
-twine==1.10.0
-
-

setup.cfg

 [bumpversion]
-current_version = 2017.006
+current_version = 2018.135
 commit = True
 tag = True
 

setup.py

@@ -30,6 +30,19 @@ setup(
     },
     install_requires=[],
     setup_requires = [],
+    extras_require={
+        'dev': [
+            'pip',
+            'bumpversion',
+            'wheel',
+            'watchdog',
+            'flake8',
+            'tox',
+            'coverage',
+            'Sphinx',
+            'twine',
+        ]
+    },
     license="GNU General Public License v3",
     long_description=readme + '\n\n' + history,
     include_package_data=True,
@@ -38,6 +51,6 @@ setup(
     packages=find_packages(include=['bline']),
     test_suite='tests',
     url='https://git.passcal.nmt.edu/passoft/bline',
-    version='2017.006',
+    version='2018.135',
     zip_safe=False,
 )

tox.ini

 [tox]
-envlist = py27, flake8
+envlist = py27, py36 flake8
 
 [travis]
 python =
     2.7: py27
+    3.6: py36
 
 [testenv:flake8]
 basepython = python
@@ -13,6 +14,6 @@ commands = flake8 bline
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}
-python setup.py test
+commands=python setup.py test