Skip to content

Commit 4ceff50

Browse files
authored
Merge pull request #51 from epfl-lts2/release/0.6.0
Update to get to 0.6.0 release
2 parents 77e1290 + 90fff90 commit 4ceff50

File tree

5 files changed

+36
-50
lines changed

5 files changed

+36
-50
lines changed

.readthedocs.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
14
version: 2
25

6+
build:
7+
os: ubuntu-22.04
8+
tools:
9+
python: "3.11"
10+
311
formats:
412
- htmlzip
513

.travis.yml

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

CONTRIBUTING.rst

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@ The package can be set up (ideally in a fresh virtual environment) for local
1414
development with the following::
1515

1616
$ git clone https://github.com/epfl-lts2/pyunlocbox.git
17+
$ cd pyunlocbox
18+
$ uv sync --dev
19+
$ source .venv/bin/activate # On Windows: .venv\Scripts\activate
20+
21+
Or with pip (legacy method)::
22+
1723
$ pip install --upgrade --editable pyunlocbox[dev]
1824

19-
The ``dev`` "extras requirement" ensures that dependencies required for
25+
The ``dev`` dependencies ensure that packages required for
2026
development (to run the test suite and build the documentation) are installed.
2127

2228
You can improve or add solvers, functions, and acceleration schemes in
@@ -30,7 +36,7 @@ short example in ``examples``.
3036
Update ``README.rst`` and ``CHANGELOG.rst`` if applicable.
3137

3238
After making any change, please check the style, run the tests, and build the
33-
documentation with the following (enforced by Travis CI)::
39+
documentation with the following (enforced by GitHub Actions)::
3440

3541
$ make lint
3642
$ make test
@@ -42,31 +48,31 @@ tests reasonably cover the changes you've introduced.
4248
To iterate faster, you can partially run the test suite, at various degrees of
4349
granularity, as follows::
4450

45-
$ python -m unittest pyunlocbox.tests.test_functions
46-
$ python -m unittest pyunlocbox.tests.test_functions.TestCase.test_norm_l1
51+
$ uv run pytest pyunlocbox/tests/test_functions.py
52+
$ uv run pytest pyunlocbox/tests/test_functions.py::TestFunctions::test_norm_l1
4753

4854
Making a release
4955
----------------
5056

51-
#. Update the version number and release date in ``setup.py``,
57+
#. Update the version number and release date in ``pyproject.toml``,
5258
``pyunlocbox/__init__.py`` and ``CHANGELOG.rst``.
5359
#. Create a git tag with ``git tag -a v0.5.0 -m "PyUNLocBox v0.5.0"``.
54-
#. Push the tag to GitHub with ``git push github v0.5.0``. The tag should now
60+
#. Push the tag to GitHub with ``git push origin v0.5.0``. The tag should now
5561
appear in the releases and tags tab.
5662
#. `Create a release <https://github.com/epfl-lts2/pygsp/releases/new>`_ on
5763
GitHub and select the created tag. A DOI should then be issued by Zenodo.
5864
#. Go on Zenodo and fix the metadata if necessary.
59-
#. Build the distribution with ``make dist`` and check that the
65+
#. Build the distribution with ``make dist`` (or ``uv build``) and check that the
6066
``dist/pyunlocbox-0.5.0.tar.gz`` source archive contains all required files.
6167
The binary wheel should be found as
62-
``dist/pyunlocbox-0.5.0-py2.py3-none-any.whl``.
68+
``dist/pyunlocbox-0.5.0-py3-none-any.whl``.
6369
#. Test the upload and installation process::
6470

65-
$ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
66-
$ pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pyunlocbox
71+
$ uv run twine upload --repository-url https://test.pypi.org/legacy/ dist/*
72+
$ uv pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pyunlocbox
6773

6874
Log in as the LTS2 user.
69-
#. Build and upload the distribution to the real PyPI with ``make release``.
75+
#. Build and upload the distribution to the real PyPI with ``make release`` (or ``uv run twine upload dist/*``).
7076
#. Update the conda feedstock (at least the version number and sha256 in
7177
``recipe/meta.yaml``) by sending a PR to
7278
`conda-forge <https://github.com/conda-forge/pyunlocbox-feedstock>`_.

README.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ and development takes place on
1111
`GitHub <https://github.com/epfl-lts2/pyunlocbox>`_.
1212
A (mostly unmaintained) `Matlab version <https://epfl-lts2.github.io/unlocbox-html>`_ exists.
1313

14-
+-----------------------------------+
15-
| |doc| |pypi| |conda| |binder| |
16-
+-----------------------------------+
17-
| |zenodo| |license| |pyversions| |
18-
+-----------------------------------+
19-
| |travis| |coveralls| |github| |
20-
+-----------------------------------+
14+
+-----------------------------------------+
15+
| |doc| |pypi| |conda| |binder| |
16+
+-----------------------------------------+
17+
| |zenodo| |license| |pyversions| |
18+
+-----------------------------------------+
19+
| |github-actions| |coveralls| |github| |
20+
+-----------------------------------------+
2121

2222
.. |doc| image:: https://readthedocs.org/projects/pyunlocbox/badge/?version=latest
2323
:target: https://pyunlocbox.readthedocs.io
@@ -29,8 +29,8 @@ A (mostly unmaintained) `Matlab version <https://epfl-lts2.github.io/unlocbox-ht
2929
:target: https://github.com/epfl-lts2/pyunlocbox/blob/master/LICENSE.txt
3030
.. |pyversions| image:: https://img.shields.io/pypi/pyversions/pyunlocbox.svg
3131
:target: https://pypi.org/project/pyunlocbox
32-
.. |travis| image:: https://img.shields.io/travis/com/epfl-lts2/pyunlocbox.svg
33-
:target: https://app.travis-ci.com/github/epfl-lts2/pyunlocbox
32+
.. |github-actions| image:: https://github.com/epfl-lts2/pyunlocbox/workflows/CI/badge.svg
33+
:target: https://github.com/epfl-lts2/pyunlocbox/actions
3434
.. |coveralls| image:: https://img.shields.io/coveralls/github/epfl-lts2/pyunlocbox.svg
3535
:target: https://coveralls.io/github/epfl-lts2/pyunlocbox
3636
.. |github| image:: https://img.shields.io/github/stars/epfl-lts2/pyunlocbox.svg?style=social
@@ -220,7 +220,7 @@ Build documentation::
220220

221221
$ uv run sphinx-build -b html doc/ doc/_build/
222222

223-
Note: This project has migrated from Travis CI to GitHub Actions. The ``.travis.yml`` file can be removed once the migration is complete.
223+
Note: This project uses GitHub Actions for continuous integration and deployment.
224224

225225
Similar libraries
226226
-----------------

pyunlocbox/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from pyunlocbox import operators # noqa: F401
2121
from pyunlocbox import solvers # noqa: F401
2222

23-
__version__ = "0.5.2"
23+
__version__ = "0.6.0"
2424
__release_date__ = "2017-12-15"
2525

2626

0 commit comments

Comments
 (0)