diff options
| author | jvoisin | 2023-08-02 21:09:12 +0200 |
|---|---|---|
| committer | jvoisin | 2023-08-02 21:09:12 +0200 |
| commit | 04786d75dab33bc292067a114c075f403719bfac (patch) | |
| tree | 61b950e68222772cb9603df96fe5f2b9e591df9c | |
| parent | cb7b5747a8f6178257bc7723e99de5b8feffb902 (diff) | |
Bump the changelog0.13.4
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 25 | ||||
| -rw-r--r-- | doc/mat2.1 | 2 | ||||
| -rwxr-xr-x | mat2 | 2 | ||||
| -rw-r--r-- | pyproject.toml | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
6 files changed, 26 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd4785..50b4b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | # 0.13.4 - 2023-08-02 | ||
| 2 | |||
| 3 | - Add documentation about mat2 on OSX | ||
| 4 | - Make use of python3.7 constructs to simplify code | ||
| 5 | - Use moderner type annotations | ||
| 6 | - Harden get_meta in archive.py against variants of CVE-2022-35410 | ||
| 7 | - Improve MSOffice document support | ||
| 8 | - Package the manpage on pypi | ||
| 9 | |||
| 1 | # 0.13.3 - 2023-02-23 | 10 | # 0.13.3 - 2023-02-23 |
| 2 | 11 | ||
| 3 | - Fix a decorator argument | 12 | - Fix a decorator argument |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a252462..69146e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
| @@ -30,15 +30,16 @@ Since mat2 is written in Python3, please conform as much as possible to the | |||
| 30 | 1. Update the [changelog](https://0xacab.org/jvoisin/mat2/blob/master/CHANGELOG.md) | 30 | 1. Update the [changelog](https://0xacab.org/jvoisin/mat2/blob/master/CHANGELOG.md) |
| 31 | 2. Update the version in the [mat2](https://0xacab.org/jvoisin/mat2/blob/master/mat2) file | 31 | 2. Update the version in the [mat2](https://0xacab.org/jvoisin/mat2/blob/master/mat2) file |
| 32 | 3. Update the version in the [setup.py](https://0xacab.org/jvoisin/mat2/blob/master/setup.py) file | 32 | 3. Update the version in the [setup.py](https://0xacab.org/jvoisin/mat2/blob/master/setup.py) file |
| 33 | 4. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1) | 33 | 4. Update the version in the [pyproject.toml](https://0xacab.org/jvoisin/mat2/blob/master/yproject.toml) file |
| 34 | 5. Commit the changelog, man page, mat2 and setup.py files | 34 | 5. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1) |
| 35 | 6. Create a tag with `git tag -s $VERSION` | 35 | 6. Commit the modified files |
| 36 | 7. Push the commit with `git push origin master` | 36 | 7. Create a tag with `git tag -s $VERSION` |
| 37 | 8. Push the tag with `git push --tags` | 37 | 8. Push the commit with `git push origin master` |
| 38 | 9. Download the gitlab archive of the release | 38 | 9. Push the tag with `git push --tags` |
| 39 | 10. Diff it against the local copy | 39 | 10. Download the gitlab archive of the release |
| 40 | 11. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz` | 40 | 11. Diff it against the local copy |
| 41 | 12. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there | 41 | 12. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz` |
| 42 | 13. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev) | 42 | 13. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there |
| 43 | 14. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*` | 43 | 14. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev) |
| 44 | 15. Do the secret release dance | 44 | 15. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*` |
| 45 | 16. Do the secret release dance | ||
| @@ -1,4 +1,4 @@ | |||
| 1 | .TH mat2 "1" "February 2023" "mat2 0.13.3" "User Commands" | 1 | .TH mat2 "1" "August 2023" "mat2 0.13.4" "User Commands" |
| 2 | 2 | ||
| 3 | .SH NAME | 3 | .SH NAME |
| 4 | mat2 \- the metadata anonymisation toolkit 2 | 4 | mat2 \- the metadata anonymisation toolkit 2 |
| @@ -17,7 +17,7 @@ except ValueError as ex: | |||
| 17 | print(ex) | 17 | print(ex) |
| 18 | sys.exit(1) | 18 | sys.exit(1) |
| 19 | 19 | ||
| 20 | __version__ = '0.13.3' | 20 | __version__ = '0.13.4' |
| 21 | 21 | ||
| 22 | logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING) | 22 | logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING) |
| 23 | 23 | ||
diff --git a/pyproject.toml b/pyproject.toml index 4956b85..02e510b 100644 --- a/pyproject.toml +++ b/pyproject.toml | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | [project] | 1 | [project] |
| 2 | name = "mat" | 2 | name = "mat" |
| 3 | version = "0.13.3" | 3 | version = "0.13.4" |
| 4 | readme = "README.md" | 4 | readme = "README.md" |
| 5 | requires-python = ">=3.9" | 5 | requires-python = ">=3.9" |
| 6 | 6 | ||
| @@ -5,7 +5,7 @@ with open("README.md", encoding='utf-8') as fh: | |||
| 5 | 5 | ||
| 6 | setuptools.setup( | 6 | setuptools.setup( |
| 7 | name="mat2", | 7 | name="mat2", |
| 8 | version='0.13.3', | 8 | version='0.13.4', |
| 9 | author="Julien (jvoisin) Voisin", | 9 | author="Julien (jvoisin) Voisin", |
| 10 | author_email="julien.voisin+mat2@dustri.org", | 10 | author_email="julien.voisin+mat2@dustri.org", |
| 11 | description="A handy tool to trash your metadata", | 11 | description="A handy tool to trash your metadata", |
