Skip to content

Commit

Permalink
Merge pull request #69 from jakirkham/recut_cookie
Browse files Browse the repository at this point in the history
Recut with cookiecutter
  • Loading branch information
jakirkham committed Mar 9, 2017
2 parents 72e92e4 + aeefe55 commit 792b9de
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -58,3 +58,6 @@ docs/kenjutsu*.rst

# PyBuilder
target/

# pyenv python configuration file
.python-version
22 changes: 11 additions & 11 deletions .travis.yml
@@ -1,3 +1,6 @@
# Config file for automatic testing at travis-ci.org
# This file will be regenerated if you run travis_pypi_setup.py

sudo: false

language: generic
Expand Down Expand Up @@ -38,23 +41,20 @@ script:

# Report coverage
after_success:
- if [[ "${PYVER}" == "3.6" ]];
then
source activate root;
conda remove -y --force -n testenv --all;
conda create -y -n testenv python="3.5";
conda remove -y --force -n testenv openssl;
conda env update -n testenv --file environment_ci.yml;
conda list --full-name -n testenv openssl || conda install -y -n testenv openssl;
source activate testenv;
fi
- source activate root
- conda create -y -n dplenv python="3.5";
- conda remove -y --force -n dplenv openssl
- conda env update -n dplenv --file environment_dpl.yml
- conda list --full-name -n dplenv openssl || conda install -y -n dplenv openssl
- source activate dplenv
- coveralls

# Disable email notifications.
notifications:
email: false

# Deploy package to PyPI when tagged.
# After you create the Github repo and add it to Travis, run the
# travis_pypi_setup.py script to finish PyPI deployment setup
deploy:
provider: pypi
distributions: sdist
Expand Down
5 changes: 4 additions & 1 deletion README.rst
Expand Up @@ -5,16 +5,19 @@ kenjutsu

.. image:: https://img.shields.io/pypi/v/kenjutsu.svg
:target: https://pypi.python.org/pypi/kenjutsu
:alt: PyPI

.. image:: https://anaconda.org/conda-forge/kenjutsu/badges/version.svg
:target: https://anaconda.org/conda-forge/kenjutsu
:alt: conda-forge

.. image:: https://img.shields.io/travis/jakirkham/kenjutsu/master.svg
:target: https://travis-ci.org/jakirkham/kenjutsu
:alt: Travis CI

.. image:: https://readthedocs.org/projects/kenjutsu/badge/?version=latest
:target: https://kenjutsu.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status
:alt: Read the Docs

.. image:: https://coveralls.io/repos/github/jakirkham/kenjutsu/badge.svg
:target: https://coveralls.io/github/jakirkham/kenjutsu
Expand Down
5 changes: 0 additions & 5 deletions docs/index.rst
@@ -1,8 +1,3 @@
.. kenjutsu documentation master file, created by
sphinx-quickstart on Tue Jul 9 22:26:36 2013.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to kenjutsu's documentation!
======================================

Expand Down
12 changes: 12 additions & 0 deletions environment_dpl.yml
@@ -0,0 +1,12 @@
name: kenjutsu_env

channels:
- conda-forge

dependencies:
- pip==9.0.1
- wheel==0.29.0
- coverage==3.7.1
- python-coveralls==2.5.0
- cryptography==1.4
- pyyaml==3.11
4 changes: 2 additions & 2 deletions kenjutsu/__init__.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

__author__ = 'John Kirkham'
__email__ = 'kirkhamj@janelia.hhmi.org'
__author__ = """John Kirkham"""
__email__ = "kirkhamj@janelia.hhmi.org"

from ._version import get_versions
__version__ = get_versions()['version']
Expand Down

0 comments on commit 792b9de

Please sign in to comment.