Skip to content

Commit 2aa9fe5

Browse files
authored
Merge pull request #103 from mrava87/main
Prepare for v0.5.0
2 parents f630121 + 12d3979 commit 2aa9fe5

File tree

6 files changed

+27
-8
lines changed

6 files changed

+27
-8
lines changed

CHANGELOG.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
# 0.5.0
2+
* Added ``pyproximal.proximal.Log1`` operator
3+
* Allow ``radius`` parameter of ``pyproximal.optimization.primal.L0`` to be a function
4+
* Allow ``tau`` parameter of ``pyproximal.optimization.primal.HQS`` to be a vector
5+
and change over iterations
6+
* Added ``z0`` to ``pyproximal.optimization.primal.HQS``
7+
* Added ``factorize`` option to ``densesolver`` of ``pyproximal.proximal.L2``
8+
19
# 0.4.0
210
* Added ``pyproximal.optimization.primal.ADMML2``,
3-
``pyproximal.optimization.primal.HQS``,
11+
`pyproximal.optimization.primal.HQS`,
412
and ``pyproximal.optimization.pnp.PlugAndPlay`` solvers
513
* Added ``pyproximal.proximal.ETP``, ``pyproximal.proximal.Geman``,
6-
``pyproximal.proximal.L0``, ``pyproximal.proximal.Log``,
14+
``pyproximal.proximal.L0`, ``pyproximal.proximal.Log``,
715
``pyproximal.proximal.QuadraticEnvelopeCard``, ``pyproximal.proximal.SCAD``
816
operators.
9-
* Allow `tau` parameter of proximal operators to be a vector to handle problems with
17+
* Allow ``tau`` parameter of proximal operators to be a vector to handle problems with
1018
multiple right-hand sides.
1119

1220
# 0.3.0

docs/source/changelog.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
Changelog
44
=========
55

6+
Version 0.5.0
7+
--------------
8+
*Released on: 20/08/2022*
9+
10+
* Added :py:class:`pyproximal.proximal.Log1` operator
11+
* Allow ``radius`` parameter of :py:class:`pyproximal.optimization.primal.L0` to be a function
12+
* Allow ``tau`` parameter of :py:class:`pyproximal.optimization.primal.HQS` to be a vector
13+
and change over iterations
14+
* Added ``z0`` to :py:class:`pyproximal.optimization.primal.HQS`
15+
* Added ``factorize`` option to ``densesolver`` of :py:class:`pyproximal.proximal.L2`
16+
617
Version 0.4.0
718
--------------
819
*Released on: 05/06/2022*
@@ -14,7 +25,7 @@ Version 0.4.0
1425
:py:class:`pyproximal.proximal.L0`, :py:class:`pyproximal.proximal.Log`,
1526
:py:class:`pyproximal.proximal.QuadraticEnvelopeCard`, :py:class:`pyproximal.proximal.SCAD`
1627
operators.
17-
* Allow `tau` parameter of proximal operators to be a vector to handle problems with
28+
* Allow ``tau`` parameter of proximal operators to be a vector to handle problems with
1829
multiple right-hand sides.
1930

2031
Version 0.3.0

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- python>=3.8.12
88
- numpy>=1.15.0
99
- scipy>=1.8.0
10-
- pylops
10+
- pylops<2.0.0
1111
- scikit-image
1212
- matplotlib
1313
- ipython

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ dependencies:
55
- python>=3.8.12
66
- numpy>=1.15.0
77
- scipy>=1.8.0
8-
- pylops
8+
- pylops<2.0.0

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy>=1.15.0
22
scipy>=1.8.0
3-
pylops
3+
pylops<2.0.0
44
numba
55
scikit-image
66
matplotlib

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def src(pth):
3030
],
3131
author='mrava',
3232
author_email='[email protected]',
33-
install_requires=['numpy >= 1.15.0', 'scipy >= 1.8.0', 'pylops'],
33+
install_requires=['numpy >= 1.15.0', 'scipy >= 1.8.0', 'pylops < 2.0.0'],
3434
extras_require={'advanced': ['llvmlite', 'numba']},
3535
packages=find_packages(exclude=['pytests']),
3636
use_scm_version=dict(root='.',

0 commit comments

Comments
 (0)