summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--CONTRIBUTING.md25
-rw-r--r--doc/mat2.12
-rwxr-xr-xmat22
-rw-r--r--pyproject.toml2
-rw-r--r--setup.py2
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
301. Update the [changelog](https://0xacab.org/jvoisin/mat2/blob/master/CHANGELOG.md) 301. Update the [changelog](https://0xacab.org/jvoisin/mat2/blob/master/CHANGELOG.md)
312. Update the version in the [mat2](https://0xacab.org/jvoisin/mat2/blob/master/mat2) file 312. Update the version in the [mat2](https://0xacab.org/jvoisin/mat2/blob/master/mat2) file
323. Update the version in the [setup.py](https://0xacab.org/jvoisin/mat2/blob/master/setup.py) file 323. Update the version in the [setup.py](https://0xacab.org/jvoisin/mat2/blob/master/setup.py) file
334. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1) 334. Update the version in the [pyproject.toml](https://0xacab.org/jvoisin/mat2/blob/master/yproject.toml) file
345. Commit the changelog, man page, mat2 and setup.py files 345. Update the version and date in the [man page](https://0xacab.org/jvoisin/mat2/blob/master/doc/mat2.1)
356. Create a tag with `git tag -s $VERSION` 356. Commit the modified files
367. Push the commit with `git push origin master` 367. Create a tag with `git tag -s $VERSION`
378. Push the tag with `git push --tags` 378. Push the commit with `git push origin master`
389. Download the gitlab archive of the release 389. Push the tag with `git push --tags`
3910. Diff it against the local copy 3910. Download the gitlab archive of the release
4011. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz` 4011. Diff it against the local copy
4112. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there 4112. If there is no difference, sign the archive with `gpg --armor --detach-sign mat2-$VERSION.tar.xz`
4213. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev) 4213. Upload the signature on Gitlab's [tag page](https://0xacab.org/jvoisin/mat2/tags) and add the changelog there
4314. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*` 4314. Announce the release on the [mailing list](https://mailman.boum.org/listinfo/mat-dev)
4415. Do the secret release dance 4415. Sign'n'upload the new version on pypi with `python3 setup.py sdist bdist_wheel` then `twine upload -s dist/*`
4516. 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 @@
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
4mat2 \- the metadata anonymisation toolkit 2 4mat2 \- 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:
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
22logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING) 22logging.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]
2name = "mat" 2name = "mat"
3version = "0.13.3" 3version = "0.13.4"
4readme = "README.md" 4readme = "README.md"
5requires-python = ">=3.9" 5requires-python = ">=3.9"
6 6
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:
5 5
6setuptools.setup( 6setuptools.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",