Merge pull request #528 from wright-group/development

3.0.0

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Require review from one maintainer for pushes to Development and Master
 
-* @untzag @ksunden
+* @untzag @ksunden @p770193

.gitignore

@@ -1,26 +1,8 @@
-# Byte-compiled / optimized / DLL files
+# byte-compiled
 __pycache__/
 *.py[cod]
 
-# C extensions
-*.so
-
-# vim swap files
-*.sw?
-
-# emacs
-flycheck_*.el
-.projectile
-
-# Images
-*.jpg
-*.gif
-*.png
-!logo/logo.png
-*.svg
-*.ico
-
-# Distribution / packaging
+# distribution / packaging
 .Python
 env/
 build/
@@ -40,39 +22,25 @@ temp/
 *.egg
 *.p
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
+# emacs
+flycheck_*.el
+.projectile
+*.#*
 
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
+# images
+*.jpg
+*.gif
+*.png
+!logo/logo.png
+*.svg
+*.ico
 
-# Unit test / coverage reports
-htmlcov/
-.tox/
+# tests / coverage reports
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *,cover
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Google Drive
-*desktop.inibuild/
-dist/
+# vim
+*.sw?

.travis.yml

@@ -1,27 +1,10 @@
 language: python
 python:
-  # We don't actually use the Travis Python, but this keeps it organized.
-  - "2.7"
-  - "3.3"
-  - "3.4"
   - "3.5"
   - "3.6"
 install:
   - sudo apt-get update
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    fi
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda config --add channels conda-forge
-  - conda update -q conda
-  - conda info -a
-  - conda create -n wrighttools --file requirements.txt
-  - source activate wrighttools
+  - sudo apt-get install libfreetype6-dev hdf5-tools libhdf5-dev libopenblas-dev
   - python setup.py install
 before_script:
 - "export DISPLAY=:99.0"

CONTRIBUTORS

@@ -1,10 +1,10 @@
 Maintainers (alphabetical by last name)
+  Daniel Kohler (@p770193)
   Kyle Sunden <sunden@wisc.edu> (@ksunden)
   Blaise Thompson <blaise@untzag.com> (@untzag)
 
 Contributors (alphabetical by last name)
   Kyle Czech (@kjczech)
-  Daniel Kohler (@p770193)
   Darien Morrow <darienmorrow@gmail.com> (@darienmorrow)
   Nathan Neff-Mallon (@neffmallon)
   Rachel Swedin (@RachelSwedin)

README.rst

@@ -1,8 +1,3 @@
-.. image:: ./logo/logo.png
-   :scale: 25 %
-   :alt: WrightTools
-   :align: center
-
 WrightTools
 -----------
 
@@ -21,3 +16,9 @@ Documentation at `wright.tools <http://wright.tools>`_.
 
 .. image:: https://readthedocs.org/projects/wrighttools/badge/?version=development
    :target: http://wright.tools/en/development/?badge=development
+
+.. image:: ./logo/logo.png
+   :scale: 25 %
+   :alt: WrightTools
+   :align: center
+

VERSION

@@ -1 +1 @@
-2.13.9
+3.0.0

WT5_VERSION

@@ -0,0 +1 @@
+1.0.0

WrightTools/__init__.py

@@ -1,47 +1,29 @@
 """WrightTools init."""
+# flake8: noqa
 
 
 # --- import --------------------------------------------------------------------------------------
 
 
 import sys as _sys
-import os as _os
 
-import matplotlib as _matplotlib
+from .__version__ import *
+from .__wt5_version__ import *
+from . import artists
+from . import collection
+from . import data
+from . import diagrams
+from . import kit
+from . import units
+from . import exceptions
 
-from . import artists           # noqa: F401
-from . import calibration       # noqa: F401
-from . import collection        # noqa: F401
-from . import data              # noqa: F401
-from . import diagrams          # noqa: F401
-from . import fit               # noqa: F401
-from . import google_drive      # noqa: F401
-from . import kit               # noqa: F401
-from . import tuning            # noqa: F401
-from . import units             # noqa: F401
-
-
-# --- version -------------------------------------------------------------------------------------
-
-
-# read from VERSION file
-_here = _os.path.abspath(_os.path.dirname(__file__))
-with open(_os.path.join(_os.path.dirname(_here), 'VERSION')) as _version_file:
-    __version__ = _version_file.read().strip()
-
-# add git branch, if appropriate
-_directory = _os.path.dirname(_os.path.dirname(__file__))
-_p = _os.path.join(_directory, '.git', 'HEAD')
-if _os.path.isfile(_p):
-    with open(_p) as _f:
-        __branch__ = _f.readline().rstrip().split(r'/')[-1]
-    if __branch__ != 'master':
-        __version__ += '-' + __branch__
-else:
-    __branch__ = None
+from ._open import *
+from .collection._collection import *
+from .data._data import *
 
 
 # --- rcparams ------------------------------------------------------------------------------------
 
-if int(_sys.version.split('.')[0]) > 2 and int(_matplotlib.__version__.split('.')[0]) > 1:
+
+if int(_sys.version.split('.')[0]) > 2:
     artists.apply_rcparams('fast')

WrightTools/__version__.py

@@ -0,0 +1,35 @@
+"""Define WrightTools version."""
+
+
+# --- import --------------------------------------------------------------------------------------
+
+
+import os
+
+
+# ---- define -------------------------------------------------------------------------------------
+
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+__all__ = ['__version__', '__branch__']
+
+
+# --- version -------------------------------------------------------------------------------------
+
+
+# read from VERSION file
+with open(os.path.join(os.path.dirname(here), 'VERSION')) as f:
+    __version__ = f.read().strip()
+
+
+# add git branch, if appropriate
+p = os.path.join(os.path.dirname(here), '.git', 'HEAD')
+if os.path.isfile(p):
+    with open(p) as f:
+        __branch__ = f.readline().rstrip().split(r'/')[-1]
+    if __branch__ != 'master':
+        __version__ += '-' + __branch__
+else:
+    __branch__ = None

WrightTools/__wt5_version__.py

@@ -0,0 +1,24 @@
+"""Define wt5 version."""
+
+
+# --- import --------------------------------------------------------------------------------------
+
+
+import os
+
+
+# ---- define -------------------------------------------------------------------------------------
+
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+__all__ = ['__wt5_version__']
+
+
+# --- version -------------------------------------------------------------------------------------
+
+
+# read from VERSION file
+with open(os.path.join(os.path.dirname(here), 'WT5_VERSION')) as f:
+    __wt5_version__ = f.read().strip()