Preparing for release 1.6

doc/source/conf.py

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

doc/source/download.rst

@@ -1,7 +1,7 @@
 *************************
 Download and Installation
 *************************
-The entire package for is available as a `gzipped tar <https://pypi.python.org/packages/source/n/ncpol2sdpa/ncpol2sdpa-1.5.tar.gz>`_ file from the `Python Package Index <https://pypi.python.org/pypi/ncpol2sdpa/>`_, containing the source, documentation, and examples.
+The entire package for is available as a `gzipped tar <https://pypi.python.org/packages/source/n/ncpol2sdpa/ncpol2sdpa-1.6.tar.gz>`_ file from the `Python Package Index <https://pypi.python.org/pypi/ncpol2sdpa/>`_, containing the source, documentation, and examples.
 
 The latest development version is available on `GitHub <https://github.com/peterwittek/ncpol2sdpa>`_.
 

doc/source/revision_history.rst

@@ -1,23 +1,15 @@
 Revision History
 ****************
 
-**Since version 1.5**
-
-  - Syntax for passing parameters changed. Only the level of the relaxation is
-    compulsory for obtaining a relaxation.
-  - Extra parameter for bounds on the variables was added. Syntax is identical 
-    to the inequalities. The difference is that the inequalities in the bounds 
-    will not be relaxed by localizing matrices.
-  - Extra parameter for passing additional variables to the Nieto-Silleras
-    hierarchy. This is important because the top-left element of the blocks of 
-    moment matrices in the relaxation is not one: they add up to one. Hence
-    specifying the last element of a measurement becomes possible with this 
-    option.
-  - Support for chordal graph extension in the commutative case
-    (doi:`10.1137/050623802 <http://dx.doi.org/10.1137/050623802>`_). Pass ``hierarchy="npa_chordal"`` to the constructor.
+**Version 1.6 (2014-12-22)**
+
+  - Syntax for passing parameters changed. Only the level of the relaxation is compulsory for obtaining a relaxation.
+  - Extra parameter for bounds on the variables was added. Syntax is identical to the inequalities. The difference is that the inequalities in the bounds will not be relaxed by localizing matrices.
+  - Support for chordal graph extension in the commutative case (doi:`10.1137/050623802 <http://dx.doi.org/10.1137/050623802>`_). Pass ``hierarchy="npa_chordal"`` to the constructor.
   - It is possible to pass variables which will not be relaxed. Pass ``nonrelaxed=[variables]`` to the constructor.
   - It is possible to change the constraints once the moment matrix is generated. Refer to the new function ``process_constraints``.
-  - PICOS conversion routines were separated.
+  - Extra parameter ``nsextraobjvars=[]`` was added for passing additional variables to the Nieto-Silleras hierarchy. This is important because the top-left elements of the blocks of moment matrices in the relaxation are not one: they add up to one. Hence specifying the last element of a measurement becomes possible with this option. The number of elements in this must match the number of behaviours.
+  - PICOS conversion routines were separated and reworked to ensure sparsity.
   - Moved documentation to Sphinx.
   - SciPy dependency made optional.
 

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='ncpol2sdpa',
-    version='1.5',
+    version='1.6',
     author='Peter Wittek',
     author_email='[email protected]',
     packages=['ncpol2sdpa'],
@@ -41,6 +41,6 @@
     ],
     install_requires=[
         "sympy >= 0.7.2",
-        "scipy >= 0.13"
+        "numpy"
     ],
 )