Merge pull request #103 from mrava87/main

Prepare for v0.5.0
PyLops · Aug 20, 2022 · 2aa9fe5 · 2aa9fe5
2 parents f630121 + 12d3979
commit 2aa9fe5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,20 @@
+# 0.5.0
+* Added  ``pyproximal.proximal.Log1`` operator
+* Allow ``radius`` parameter of ``pyproximal.optimization.primal.L0`` to be a function
+* Allow ``tau`` parameter of ``pyproximal.optimization.primal.HQS`` to be a vector
+  and change over iterations
+* Added ``z0`` to ``pyproximal.optimization.primal.HQS``
+* Added ``factorize`` option to ``densesolver`` of ``pyproximal.proximal.L2``
+
 # 0.4.0
 * Added ``pyproximal.optimization.primal.ADMML2``,
-  ``pyproximal.optimization.primal.HQS``,
+  `pyproximal.optimization.primal.HQS`,
   and ``pyproximal.optimization.pnp.PlugAndPlay`` solvers
 * Added ``pyproximal.proximal.ETP``, ``pyproximal.proximal.Geman``,
-  ``pyproximal.proximal.L0``, ``pyproximal.proximal.Log``,
+  ``pyproximal.proximal.L0`, ``pyproximal.proximal.Log``,
   ``pyproximal.proximal.QuadraticEnvelopeCard``, ``pyproximal.proximal.SCAD``
   operators.
-* Allow `tau` parameter of proximal operators to be a vector to handle problems with
+* Allow ``tau`` parameter of proximal operators to be a vector to handle problems with
   multiple right-hand sides.
 
 # 0.3.0

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3,6 +3,17 @@
 Changelog
 =========
 
+Version 0.5.0
+--------------
+*Released on: 20/08/2022*
+
+* Added  :py:class:`pyproximal.proximal.Log1` operator
+* Allow ``radius`` parameter of :py:class:`pyproximal.optimization.primal.L0` to be a function
+* Allow ``tau`` parameter of :py:class:`pyproximal.optimization.primal.HQS` to be a vector
+  and change over iterations
+* Added ``z0`` to :py:class:`pyproximal.optimization.primal.HQS`
+* Added ``factorize`` option to ``densesolver`` of :py:class:`pyproximal.proximal.L2`
+
 Version 0.4.0
 --------------
 *Released on: 05/06/2022*
@@ -14,7 +25,7 @@ Version 0.4.0
   :py:class:`pyproximal.proximal.L0`, :py:class:`pyproximal.proximal.Log`,
   :py:class:`pyproximal.proximal.QuadraticEnvelopeCard`, :py:class:`pyproximal.proximal.SCAD`
   operators.
-* Allow `tau` parameter of proximal operators to be a vector to handle problems with
+* Allow ``tau`` parameter of proximal operators to be a vector to handle problems with
   multiple right-hand sides.
 
 Version 0.3.0

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -7,7 +7,7 @@ dependencies:
   - python>=3.8.12
   - numpy>=1.15.0
   - scipy>=1.8.0
-  - pylops
+  - pylops<2.0.0
   - scikit-image
   - matplotlib
   - ipython

diff --git a/environment.yml b/environment.yml
@@ -5,4 +5,4 @@ dependencies:
   - python>=3.8.12
   - numpy>=1.15.0
   - scipy>=1.8.0
-  - pylops
+  - pylops<2.0.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,6 @@
 numpy>=1.15.0
 scipy>=1.8.0
-pylops
+pylops<2.0.0
 numba
 scikit-image
 matplotlib

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def src(pth):
     ],
     author='mrava',
     author_email='[email protected]',
-    install_requires=['numpy >= 1.15.0', 'scipy >= 1.8.0', 'pylops'],
+    install_requires=['numpy >= 1.15.0', 'scipy >= 1.8.0', 'pylops < 2.0.0'],
     extras_require={'advanced': ['llvmlite', 'numba']},
     packages=find_packages(exclude=['pytests']),
     use_scm_version=dict(root='.',