Skip to content

Commit 35c4ca6

Browse files
mrava87mrava87
authored
Merge pull request #193 from PyLops/dev
v0.10.0
2 parents 1e9e91b + 8de1fdf commit 35c4ca6

22 files changed

+409
-76
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ jobs:
66
build:
77
strategy:
88
matrix:
9-
platform: [ ubuntu-latest, macos-latest ]
10-
python-version: ["3.8", "3.9", "3.10", "3.11"]
9+
platform: [ ubuntu-latest ] # temporarily removed macos-latest because of different behavior with numpy v2
10+
python-version: ["3.9", "3.10", "3.11"]
1111

1212
runs-on: ${{ matrix.platform }}
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Get history and tags for SCM versioning to work
1616
run: |
1717
git fetch --prune --unshallow
1818
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
1919
- name: Set up Python ${{ matrix.python-version }}
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
- name: Install dependencies

‎.readthedocs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ sphinx:
1818
# Declare the Python requirements required to build your docs
1919
python:
2020
install:
21-
- requirements: requirements-dev.txt
21+
- requirements: requirements-doc.txt
2222
- method: pip
2323
path: .

‎.travis.yml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
Changelog
22
=========
33

4+
# 0.10.0
5+
6+
* Added ``pyproximal.optimization.primal.AndersonProximalGradient`` solver
7+
* Added ``pyproximal.proximal.HuberCircular`` operator
8+
* Added `fungrad` method to ``pyproximal.proximal.Nonlinear``
9+
* Modified ``pyproximal.proximal.Huber`` operator as previously
10+
erroneously implemented using the definition of Circular Huber norm
11+
12+
413
# 0.9.0
514

6-
* Added :py:class:`pyproximal.optimization.palm.iPALM` solver
7-
* Added :py:func:`pyproximal.optimization.palm._backtracking` method to be used when `gammaf=None` and/or `gammag=None`
8-
* Added :py:func:`pyproximal.utils.gradtest.gradtest_proximal` and :py:func:`pyproximal.utils.gradtest.gradtest_bilinear` methods
9-
* Added `tol` to :py:class:`pyproximal.optimization.primal.ProximalPoint` and
10-
:py:class:`pyproximal.optimization.primal.ProximalGradient` solvers
11-
* Modified :py:class:`pyproximal.ProxOperator.precomposition` to allow `b` being also a vector
15+
* Added ``pyproximal.optimization.palm.iPALM`` solver
16+
* Added ``pyproximal.optimization.palm._backtracking`` method to be used when `gammaf=None` and/or `gammag=None`
17+
* Added ``pyproximal.utils.gradtest.gradtest_proximal`` and ``pyproximal.utils.gradtest.gradtest_bilinear`` methods
18+
* Added `tol` to ``pyproximal.optimization.primal.ProximalPoint`` and
19+
``pyproximal.optimization.primal.ProximalGradient`` solvers
20+
* Modified ``pyproximal.ProxOperator.precomposition`` to allow `b` being also a vector
1221

1322

1423
# 0.8.0

‎azure-pipelines.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# steps:
2626
# - task: UsePythonVersion@0
2727
# inputs:
28-
# versionSpec: '3.8'
28+
# versionSpec: '3.9'
2929
# architecture: 'x64'
3030
#
3131
# - script: |
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- task: UsePythonVersion@0
5656
inputs:
57-
versionSpec: '3.8'
57+
versionSpec: '3.9'
5858
architecture: 'x64'
5959

6060
- script: |
@@ -83,7 +83,7 @@ jobs:
8383
steps:
8484
- task: UsePythonVersion@0
8585
inputs:
86-
versionSpec: '3.8'
86+
versionSpec: '3.9'
8787
architecture: 'x64'
8888

8989
- script: |

‎docs/source/api/index.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Convex
6666
EuclideanBall
6767
Hankel
6868
Huber
69+
HuberCircular
6970
Intersection
7071
L0
7172
L0Ball
@@ -157,6 +158,7 @@ Primal
157158
AcceleratedProximalGradient
158159
ADMM
159160
ADMML2
161+
AndersonProximalGradient
160162
GeneralizedProximalGradient
161163
HQS
162164
LinearizedADMM

‎docs/source/changelog.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
Changelog
44
=========
55

6+
Version 0.10.0
7+
--------------
8+
*Released on: 11/12/2024*
9+
10+
* Added :py:func:`pyproximal.optimization.primal.AndersonProximalGradient` solver
11+
* Added :py:class:`pyproximal.proximal.HuberCircular` operator
12+
* Added `fungrad` method to :py:class:`pyproximal.proximal.Nonlinear`
13+
* Modified :py:class:`pyproximal.proximal.Huber` operator as previously
14+
erroneously implemented using the definition of Circular Huber norm
15+
16+
617
Version 0.9.0
718
--------------
819
*Released on: 16/08/2024*

‎environment-dev-arm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ channels:
55
- numba
66
dependencies:
77
- python>=3.8.12
8-
- numpy>=1.15.0, <2.0.0
9-
- scipy>=1.8.0
8+
- numpy>=1.21.0
9+
- scipy>=1.11.0
1010
- pylops>=2.0.0
1111
- scikit-image
1212
- matplotlib

‎environment-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ channels:
55
- numba
66
dependencies:
77
- python>=3.8.12
8-
- numpy>=1.15.0, <2.0.0
9-
- scipy>=1.8.0
8+
- numpy>=1.21.0
9+
- scipy>=1.11.0
1010
- pylops>=2.0.0
1111
- scikit-image
1212
- matplotlib

‎environment.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ channels:
33
- defaults
44
dependencies:
55
- python>=3.8.12
6-
- numpy>=1.15.0, <2.0.0
7-
- scipy>=1.8.0
6+
- numpy>=1.21.0
7+
- scipy>=1.11.0
88
- pylops>=2.0.0

0 commit comments

Comments
 (0)