diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd4785..50b4b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 0.13.4 - 2023-08-02 + +- Add documentation about mat2 on OSX +- Make use of python3.7 constructs to simplify code +- Use moderner type annotations +- Harden get_meta in archive.py against variants of CVE-2022-35410 +- Improve MSOffice document support +- Package the manpage on pypi + # 0.13.3 - 2023-02-23 - 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 1. Update the [changelog](https://0xacab.org/jvoisin/mat2/blob/master/CHANGELOG.md) 2. Update the version in the [mat2](https://0xacab.org/jvoisin/mat2/blob/master/mat2) file 3. Update the version in the [setup.py](https://0xacab.org/jvoisin/mat2/blob/master/setup.py) file -4. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1) -5. Commit the changelog, man page, mat2 and setup.py files -6. Create a tag with `git tag -s $VERSION` -7. Push the commit with `git push origin master` -8. Push the tag with `git push --tags` -9. Download the gitlab archive of the release -10. Diff it against the local copy -11. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz` -12. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there -13. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev) -14. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*` -15. Do the secret release dance +4. Update the version in the [pyproject.toml](https://0xacab.org/jvoisin/mat2/blob/master/yproject.toml) file +5. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1) +6. Commit the modified files +7. Create a tag with `git tag -s $VERSION` +8. Push the commit with `git push origin master` +9. Push the tag with `git push --tags` +10. Download the gitlab archive of the release +11. Diff it against the local copy +12. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz` +13. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there +14. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev) +15. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*` +16. Do the secret release dance diff --git a/doc/mat2.1 b/doc/mat2.1 index 0b0e27c..9ed9ff4 100644 --- a/doc/mat2.1 +++ b/doc/mat2.1 @@ -1,4 +1,4 @@ -.TH mat2 "1" "February 2023" "mat2 0.13.3" "User Commands" +.TH mat2 "1" "August 2023" "mat2 0.13.4" "User Commands" .SH NAME mat2 \- the metadata anonymisation toolkit 2 diff --git a/mat2 b/mat2 index 15b2fd2..e22512c 100755 --- a/mat2 +++ b/mat2 @@ -17,7 +17,7 @@ except ValueError as ex: print(ex) sys.exit(1) -__version__ = '0.13.3' +__version__ = '0.13.4' logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING) diff --git a/pyproject.toml b/pyproject.toml index 4956b85..02e510b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "mat" -version = "0.13.3" +version = "0.13.4" readme = "README.md" requires-python = ">=3.9" diff --git a/setup.py b/setup.py index e99b852..356ca4b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", encoding='utf-8') as fh: setuptools.setup( name="mat2", - version='0.13.3', + version='0.13.4', author="Julien (jvoisin) Voisin", author_email="julien.voisin+mat2@dustri.org", description="A handy tool to trash your metadata",