Merge branch 'development'

wright-group · Aug 8, 2017 · f491d17 · f491d17
2 parents 2317860 + 8425d52
commit f491d17
Show file tree

Hide file tree

Showing 422 changed files with 77,366 additions and 1,880 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,14 @@ __pycache__/
 # C extensions
 *.so
 
-Images
+# vim swap files
+*.sw?
+
+# Images
 *.jpg
 *.gif
 *.png
+!logo/logo.png
 *.svg
 *.ico
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,10 +1,10 @@
 Maintainers (alphabetical by last name)
+  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)
-  Kyle Sunden <sunden@wisc.edu> (@ksunden)
   Rachel Swedin (@RachelSwedin)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
 include CONTRIBUTORS
+recursive-include WrightTools/datasets *
 include LICENSE
 include README.md
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
+<img src="logo/icon.png" align="right" />
+
 # WrightTools
 
 Tools for loading, processing, and plotting multidimensional spectroscopy data.
 
-# Installation
+# Install
 
 ## conda-forge
 
@@ -11,7 +13,7 @@ It seamlessly handles non-Python library dependencies which many scientific Pyth
 Conda is reccomended, especially for Windows users.
 If you don't have Python yet, start by [installing Anaconda](https://www.continuum.io/downloads).
 
-[conda-forge](https://conda-forge.org/) is a community-driven conda channel that contains smaller packages not maintained by [Anaconda](https://www.continuum.io/anaconda-overview).
+[conda-forge](https://conda-forge.org/) is a community-driven conda channel. [conda-forge contains a WrightTools feedstock](https://github.com/conda-forge/wrighttools-feedstock).
 
 ```
 conda config --add channels conda-forge

diff --git a/WrightTools/__init__.py b/WrightTools/__init__.py
@@ -1,26 +1,23 @@
-### create temp folder if none exists #########################################
-
-
 import sys as _sys
 import os as _os
 
 import matplotlib as _matplotlib
 
 
-### temp directory ############################################################
+# --- temp directory ------------------------------------------------------------------------------
 
 
 _temp_dir = _os.path.join(_os.path.dirname(__file__), 'temp')
 if not _os.path.isdir(_temp_dir):
     _os.mkdir(_temp_dir)
 
 
-### version ###################################################################
+# --- version -------------------------------------------------------------------------------------
 
 
 # MAJOR.MINOR.PATCH (semantic versioning)
 # major version changes may break backwards compatibility
-__version__ = '2.13.3'
+__version__ = '2.13.4'
 
 # add git branch, if appropriate
 _directory = _os.path.dirname(_os.path.dirname(__file__))
@@ -34,7 +31,7 @@
     __branch__ = None
 
 
-### import ####################################################################
+# --- import --------------------------------------------------------------------------------------
 
 
 from . import artists
@@ -48,7 +45,7 @@
 from . import units
 
 
-### rcparams ##################################################################
+# --- rcparams ------------------------------------------------------------------------------------
 
 if int(_sys.version.split('.')[0]) > 2 and int(_matplotlib.__version__.split('.')[0]) > 1:
     artists.apply_rcparams('fast')