Skip to content

Commit

Permalink
Recut with cookiecutter.
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham committed Mar 9, 2017
1 parent 3baafa1 commit 5df41df
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -58,3 +58,6 @@ docs/xnumpy*.rst

# PyBuilder
target/

# pyenv python configuration file
.python-version
11 changes: 9 additions & 2 deletions .travis.yml
Expand Up @@ -6,6 +6,7 @@ sudo: false
language: generic

env:
- PYVER="3.6"
- PYVER="3.5"
- PYVER="3.4"
- PYVER="2.7"
Expand All @@ -25,7 +26,7 @@ install:
# Create the test environment.
- conda create -y -n testenv python="${PYVER}"
- conda remove -y --force -n testenv openssl
- conda env update -n testenv --file environment_dev.yml
- 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

Expand All @@ -36,10 +37,16 @@ install:
script:
- coverage erase
- coverage run --source . setup.py test
- coverage report
- coverage report -m

# Report coverage
after_success:
- 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.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Expand Up @@ -100,7 +100,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull 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, 3.4 and 3.5. Check
3. The pull request should work for Python 2.7, 3.4, 3.5, and 3.6. Check
https://travis-ci.org/jakirkham/xnumpy/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
@@ -1,6 +1,4 @@

include AUTHORS.rst

include CONTRIBUTING.rst
include HISTORY.rst
include LICENSE.txt
Expand Down
10 changes: 8 additions & 2 deletions README.rst
Expand Up @@ -5,13 +5,19 @@ xnumpy

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

.. image:: https://img.shields.io/travis/jakirkham/xnumpy.svg
.. image:: https://anaconda.org/conda-forge/xnumpy/badges/version.svg
:target: https://anaconda.org/conda-forge/xnumpy
:alt: conda-forge

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

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

.. image:: https://coveralls.io/repos/github/jakirkham/xnumpy/badge.svg
:target: https://coveralls.io/github/jakirkham/xnumpy
Expand Down
5 changes: 0 additions & 5 deletions docs/index.rst
@@ -1,8 +1,3 @@
.. xnumpy 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 xnumpy's documentation!
======================================

Expand Down
11 changes: 11 additions & 0 deletions environment_ci.yml
@@ -0,0 +1,11 @@
name: xnumpy_env

channels:
- conda-forge

dependencies:
- pip==9.0.1
- wheel==0.29.0
- coverage==3.7.1
- python-coveralls==2.5.0
- numpy==1.11.0
10 changes: 10 additions & 0 deletions environment_doc.yml
@@ -0,0 +1,10 @@
name: xnumpy_env

channels:
- conda-forge

dependencies:
- pip==9.0.1
- wheel==0.29.0
- Sphinx==1.5.1
- numpy==1.11.0
7 changes: 2 additions & 5 deletions environment_dev.yml → environment_dpl.yml
Expand Up @@ -4,12 +4,9 @@ channels:
- conda-forge

dependencies:
- pip==8.1.2
- pip==9.0.1
- wheel==0.29.0
- flake8==2.6.2
- coverage==3.7.1
- python-coveralls=2.5.0
- Sphinx==1.4.5
- python-coveralls==2.5.0
- cryptography==1.4
- pyyaml==3.11
- numpy==1.11.0
2 changes: 1 addition & 1 deletion readthedocs.yml
@@ -1,2 +1,2 @@
conda:
file: environment_dev.yml
file: environment_doc.yml
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -46,6 +46,7 @@
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
],
test_suite="tests",
tests_require=test_requirements
Expand Down
17 changes: 11 additions & 6 deletions versioneer.py
@@ -1,5 +1,5 @@

# Version: 0.17
# Version: 0.18

"""The Versioneer - like a rocketeer, but for versions.
Expand All @@ -10,7 +10,7 @@
* https://github.com/warner/python-versioneer
* Brian Warner
* License: Public Domain
* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, and pypy
* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy
* [![Latest Version]
(https://pypip.in/version/versioneer/badge.svg?style=flat)
](https://pypi.python.org/pypi/versioneer/)
Expand Down Expand Up @@ -151,8 +151,8 @@
software (exactly equal to a known tag), the identifier will only contain the
stripped tag, e.g. "0.11".
Other styles are available. See details.md in the Versioneer source tree for
descriptions.
Other styles are available. See [details.md](details.md) in the Versioneer
source tree for descriptions.
## Debugging
Expand Down Expand Up @@ -364,6 +364,7 @@ def get(parser, name):
class NotThisMethod(Exception):
"""Exception raised if a method is not valid for the current scenario."""


# these dictionaries contain VCS-specific tools
LONG_VERSION_PY = {}
HANDLERS = {}
Expand Down Expand Up @@ -415,6 +416,8 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
print("stdout was %s" % stdout)
return None, p.returncode
return stdout, p.returncode


LONG_VERSION_PY['git'] = '''
# This file helps to compute a version number in source trees obtained from
# git-archive tarball (such as those provided by githubs download-from-tag
Expand All @@ -423,7 +426,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
# that just contains the computed version number.
# This file is released into the public domain. Generated by
# versioneer-0.17 (https://github.com/warner/python-versioneer)
# versioneer-0.18 (https://github.com/warner/python-versioneer)
"""Git implementation of _version.py."""
Expand Down Expand Up @@ -1176,8 +1179,9 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
(str(rootdirs), parentdir_prefix))
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")


SHORT_VERSION_PY = """
# This file was generated by 'versioneer.py' (0.17) from
# This file was generated by 'versioneer.py' (0.18) from
# revision-control system data, or from the parent directory name of an
# unpacked source archive. Distribution tarballs contain a pre-generated copy
# of this file.
Expand Down Expand Up @@ -1808,6 +1812,7 @@ def scan_setup_py():
errors += 1
return errors


if __name__ == "__main__":
cmd = sys.argv[1]
if cmd == "setup":
Expand Down
4 changes: 2 additions & 2 deletions xnumpy/__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
2 changes: 1 addition & 1 deletion xnumpy/_version.py
Expand Up @@ -6,7 +6,7 @@
# that just contains the computed version number.

# This file is released into the public domain. Generated by
# versioneer-0.17 (https://github.com/warner/python-versioneer)
# versioneer-0.18 (https://github.com/warner/python-versioneer)

"""Git implementation of _version.py."""

Expand Down

0 comments on commit 5df41df

Please sign in to comment.