Merge pull request #13 from phobson/diy-plotting-positions

DIY plotting positions

Author: phobson

.travis.yml

@@ -8,6 +8,9 @@ matrix:
     - python: 3.4
       env:
         - COVERAGE=false
+    - python: 3.5
+      env:
+        - COVERAGE=false
     - python: 3.5
       env:
         - COVERAGE=true
@@ -29,7 +32,8 @@ install:
 
   - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
   - source activate test
-  - conda install --yes numpy nose scipy matplotlib coverage docopt requests pyyaml
+  - conda install --yes numpy nose matplotlib coverage docopt requests pyyaml
+  - if [ ${COVERAGE} = true ]; then conda install scipy --yes; fi
   - pip install coveralls
   - pip install .
 

README.md

@@ -32,3 +32,15 @@ seaborn.despine(fig=fig)
 ```
 
 ![Alt text](docs/img/example.png "Example axes")
+
+## Testing
+
+Testing is generally done via the ``nose`` and ``numpy.testing`` modules.
+The best way to run the tests is in an interactive python session:
+
+```python
+import matplotlib
+matplotib.use('agg')
+import probscale
+probscale.test()
+```

conda.recipe/bld.bat renamed to conda.recipe/dev/bld.bat

@@ -0,0 +1,44 @@
+package:
+  name: mpl-probscale
+  version: 0.1.1
+
+source:
+  path: ../../
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+build:
+  number: 1
+
+requirements:
+  build:
+    - python
+    - numpy
+    - matplotlib
+
+  run:
+    - python
+    - numpy
+    - matplotlib
+    - nose
+
+test:
+  imports:
+    - probscale
+
+  commands:
+    - python -c "import matplotlib; matplotlib.use('agg'); import probscale; probscale.test()"
+
+  requires:
+    - nose
+    - scipy
+
+about:
+  home: http://phobson.github.io/mpl-probscale/
+  license:  BSD License
+  summary: 'Probability scales for matplotlib.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml/configure

conda.recipe/build.sh renamed to conda.recipe/dev/build.sh

@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

conda.recipe/dev/meta.yaml

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.

conda.recipe/release/bld.bat

@@ -1,10 +1,10 @@
 package:
   name: mpl-probscale
-  version: v0.1.0
+  version: 0.1.1
 
 source:
   git_url: https://github.com/phobson/mpl-probscale.git
-  git_tag: v0.1.0
+  git_tag: v0.1.1
 #  patches:
    # List any patch files here
    # - fix.patch
@@ -17,23 +17,19 @@ requirements:
     - python
     - numpy
     - matplotlib
-    - scipy
 
   run:
     - python
     - numpy
     - matplotlib
-    - scipy
+    - nose
 
 test:
   imports:
     - probscale
 
   commands:
-    - nosetests
-
-  requires:
-    - nose
+    - python -c "import matplotlib; matplotlib.use('agg'); import probscale; probscale.test()"
 
 about:
   home: http://phobson.github.io/mpl-probscale/

conda.recipe/release/build.sh

@@ -76,9 +76,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.0'
+version = '0.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

conda.recipe/meta.yaml renamed to conda.recipe/release/meta.yaml

@@ -54,22 +54,31 @@ Tutorial
 
    tutorial/getting_started.rst
 
+Testing
+-------
+
+It's easiest to run the tests from an interactive python session:
+
+.. code-block:: python
+
+    import matplotlib
+    matplotlib.use('agg')
+    import probscale
+    probscale.test()
+
+
 API References
 --------------
 
 .. toctree::
    :maxdepth: 2
 
-   probscale.rst
    viz.rst
-
-
-
+   probscale.rst
 
 Indices and tables
 ==================
 
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-