From 81fb17abd96f0bb7f9f2cdce0ab0b866a43b8fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 27 Sep 2023 01:11:23 +0200 Subject: [PATCH 1/6] Upgrade synapse to 1.93.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 12 ++++++------ conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index de7c162..d0a0123 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.92.3/matrix-synapse_1.92.3-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=e169960390a16410210ff2cf6d744ae8d53c6cd3c7586a585ad6afdaf4874094 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.93.0/matrix-synapse_1.93.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=7b81f948d3ba69f879648dc6bf2722c9bcda751cd7b81a1c18206e41d2b5b91e # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index fe1b5bb..b132bcd 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.92.3/matrix-synapse_1.92.3-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=c3e82b33d4e49e7358f0dfd2e1e80ddd7f3664f53fc494f553defebe11e918bc +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.93.0/matrix-synapse_1.93.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=570bbb9bd5d020c180b786dcf5c55b1406d1ee8dab24eb1ab620821f70f5532c # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 11ecc10..a92c437 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -7,26 +7,26 @@ certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.3 +cryptography==41.0.4 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.92.3 +matrix-synapse==1.93.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.5 +msgpack==1.0.6 ndg-httpsclient==0.5.1 netaddr==0.9.0 packaging==23.1 -phonenumbers==8.13.20 +phonenumbers==8.13.21 Pillow==10.0.1 prometheus-client==0.17.1 psycopg2==2.9.7 @@ -51,6 +51,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.4 +urllib3==2.0.5 webencodings==0.5.1 zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 33a6431..d6a5f62 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,26 +7,26 @@ certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.3 +cryptography==41.0.4 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.19.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.92.3 +matrix-synapse==1.93.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.5 +msgpack==1.0.6 ndg-httpsclient==0.5.1 -netaddr==0.8.0 +netaddr==0.9.0 packaging==23.1 -phonenumbers==8.13.20 +phonenumbers==8.13.21 Pillow==10.0.1 pkg_resources==0.0.0 prometheus-client==0.17.1 @@ -53,6 +53,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.4 +urllib3==2.0.5 webencodings==0.5.1 zope.interface==6.0 diff --git a/manifest.json b/manifest.json index 126130e..ac0236e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.92.3~ynh1", + "version": "1.93.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 5a8a4679a2df9ba736cb1f87c7fa736d1ac0df53 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Sep 2023 11:05:48 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d4a120d..cbac454 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.92.3~ynh1 +**Shipped version:** 1.93.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 2b888a1..e9e4868 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.92.3~ynh1 +**Version incluse :** 1.93.0~ynh1 ## Avertissements / informations importantes ## Configuration From 6d47809b6eab07e7140ca3dd20e3debcbdd66041 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:58:45 +0200 Subject: [PATCH 3/6] Use the last version of setuptools --- scripts/_common.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 83fd3d9..b78a3b2 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -46,13 +46,8 @@ install_sources() { set +$u_arg; source $final_path/bin/activate set -$u_arg; - if [ $(lsb_release --codename --short) == "bullseye" ]; then - # Fix issue with setuptools https://github.com/pypa/setuptools/issues/3118 - pip3 install --upgrade setuptools==60.8.2 wheel pip - else - pip3 install --upgrade setuptools wheel pip - fi - + + pip3 install --upgrade setuptools wheel pip pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt From fcea26bec3db7e0f637eaf7f99396050002f6e7a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 28 Sep 2023 19:58:48 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index d4a120d..a6d08e4 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,6 @@ Before installing a second instance of the app it's really recommended to update * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 2b888a1..bf382ab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -210,7 +210,6 @@ Before installing a second instance of the app it's really recommended to update * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 0fa77384a4cbd520ddede8ffa49f0ed99ca0968b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 11 Oct 2023 01:06:50 +0200 Subject: [PATCH 5/6] Upgrade synapse to 1.94.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 26 ++++++++++++++------------ conf/requirement_bullseye.txt | 26 ++++++++++++++------------ manifest.json | 2 +- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index d0a0123..2c57790 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.93.0/matrix-synapse_1.93.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=7b81f948d3ba69f879648dc6bf2722c9bcda751cd7b81a1c18206e41d2b5b91e +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.94.0/matrix-synapse_1.94.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=e9145698dd5f96a24bef267844821a446fef47a5f938ea9e3e09fb29d967dcb1 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index b132bcd..006f18d 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.93.0/matrix-synapse_1.93.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=570bbb9bd5d020c180b786dcf5c55b1406d1ee8dab24eb1ab620821f70f5532c +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.94.0/matrix-synapse_1.94.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=7a91ceb6a2696ea646ed7959c51549caf4006bfa565010b875dbfbfc1794c010 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index a92c437..73802ec 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,11 +1,12 @@ +annotated-types==0.6.0 attrs==23.1.0 Automat==22.10.0 bcrypt==4.0.1 -bleach==6.0.0 +bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 -cffi==1.15.1 -charset-normalizer==3.2.0 +cffi==1.16.0 +charset-normalizer==3.3.0 constantly==15.1.0 cryptography==41.0.4 hyperlink==21.0.0 @@ -20,27 +21,28 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.93.0 +matrix-synapse==1.94.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.6 +msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 -packaging==23.1 -phonenumbers==8.13.21 +packaging==23.2 +phonenumbers==8.13.22 Pillow==10.0.1 prometheus-client==0.17.1 -psycopg2==2.9.7 +psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.12 +pydantic==2.4.2 +pydantic_core==2.10.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 -rpds-py==0.10.3 +rpds-py==0.10.4 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.7.0 @@ -51,6 +53,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.5 +urllib3==2.0.6 webencodings==0.5.1 -zope.interface==6.0 +zope.interface==6.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index d6a5f62..06c6f04 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,11 +1,12 @@ +annotated-types==0.6.0 attrs==23.1.0 Automat==22.10.0 bcrypt==4.0.1 -bleach==6.0.0 +bleach==6.1.0 canonicaljson==2.0.0 certifi==2023.7.22 -cffi==1.15.1 -charset-normalizer==3.2.0 +cffi==1.16.0 +charset-normalizer==3.3.0 constantly==15.1.0 cryptography==41.0.4 hyperlink==21.0.0 @@ -20,28 +21,29 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.93.0 +matrix-synapse==1.94.0 matrix-synapse-ldap3==0.2.2 -msgpack==1.0.6 +msgpack==1.0.7 ndg-httpsclient==0.5.1 netaddr==0.9.0 -packaging==23.1 -phonenumbers==8.13.21 +packaging==23.2 +phonenumbers==8.13.22 Pillow==10.0.1 pkg_resources==0.0.0 prometheus-client==0.17.1 -psycopg2==2.9.7 +psycopg2==2.9.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.12 +pydantic==2.4.2 +pydantic_core==2.10.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 referencing==0.30.2 requests==2.31.0 -rpds-py==0.10.3 +rpds-py==0.10.4 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.7.0 @@ -53,6 +55,6 @@ treq==22.2.0 Twisted==23.8.0 typing_extensions==4.8.0 unpaddedbase64==2.1.0 -urllib3==2.0.5 +urllib3==2.0.6 webencodings==0.5.1 -zope.interface==6.0 +zope.interface==6.1 diff --git a/manifest.json b/manifest.json index ac0236e..81ae9c7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.93.0~ynh1", + "version": "1.94.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 0bf2724f02c7782bda0dcede4ecae349d80712ce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 06:52:52 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d403a0..1a24149 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.93.0~ynh1 +**Shipped version:** 1.94.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 99b9c10..157c1dd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.93.0~ynh1 +**Version incluse :** 1.94.0~ynh1 ## Avertissements / informations importantes ## Configuration