From 846dbe478f98213b248e1699edb7494e4c814f97 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 15:10:33 +0200 Subject: [PATCH 1/4] v0.8.0b1 release --- sat/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sat/VERSION b/sat/VERSION index 5d3627e8..dfca6982 100644 --- a/sat/VERSION +++ b/sat/VERSION @@ -1 +1 @@ -0.8.0D +0.8.0b1.post1 From 24910034746c73925f953881ea5f89c61802da64 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Jun 2021 15:15:13 +0200 Subject: [PATCH 2/4] Added tag v0.8.0b1 for changeset efe2445b053c From 4348af32f2287072a206124722ed292fb5d23df7 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 2 Aug 2021 21:47:16 +0200 Subject: [PATCH 3/4] docker: fix Dockerfile following repositories redirections --- docker/backend-dev/Dockerfile | 4 ++-- docker/libervia-web-dev/Dockerfile | 2 +- docker/pubsub/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/backend-dev/Dockerfile b/docker/backend-dev/Dockerfile index c1a50c3e..2da92030 100644 --- a/docker/backend-dev/Dockerfile +++ b/docker/backend-dev/Dockerfile @@ -37,10 +37,10 @@ RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && hg clone https://repos.goffi.org/sat_tmp && ~/libervia_env/bin/pip install -e sat_tmp && \ mv sat_tmp/sat_tmp.egg-info ~/libervia_env/lib/python3.*/site-packages && \ hg clone https://repos.goffi.org/sat_templates && ~/libervia_env/bin/pip install -e sat_templates && \ - mv sat_templates/sat_templates.egg-info ~/libervia_env/lib/python3.*/site-packages && \ + mv sat_templates/libervia_templates.egg-info ~/libervia_env/lib/python3.*/site-packages && \ hg clone https://repos.goffi.org/sat_media && \ hg clone https://repos.goffi.org/sat && ~/libervia_env/bin/pip install -e 'sat[SVG]' && \ - mv sat/sat.egg-info ~/libervia_env/lib/python3.*/site-packages + mv sat/libervia_backend.egg-info ~/libervia_env/lib/python3.*/site-packages ENV DBUS_SESSION_BUS_ADDRESS=tcp:host=backend,port=55555,family=ipv4 ENV PATH=/home/libervia/libervia_env/bin:$PATH diff --git a/docker/libervia-web-dev/Dockerfile b/docker/libervia-web-dev/Dockerfile index a0832204..d3f83d6f 100644 --- a/docker/libervia-web-dev/Dockerfile +++ b/docker/libervia-web-dev/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /home/libervia USER libervia RUN cd /src && hg clone https://repos.goffi.org/libervia && \ ~/libervia_env/bin/pip install -e libervia && \ - mv libervia/libervia.egg-info ~/libervia_env/lib/python3.*/site-packages + mv libervia/libervia_web.egg-info ~/libervia_env/lib/python3.*/site-packages RUN ./entrypoint.sh \ # we build here to avoid re-downloading node modules or other browser diff --git a/docker/pubsub/Dockerfile b/docker/pubsub/Dockerfile index de5bb9da..8a307890 100644 --- a/docker/pubsub/Dockerfile +++ b/docker/pubsub/Dockerfile @@ -29,6 +29,6 @@ RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && hg clone https://repos.goffi.org/sat_tmp && ~/libervia_env/bin/pip install -e sat_tmp && \ mv sat_tmp/sat_tmp.egg-info ~/libervia_env/lib/python3.*/site-packages && \ hg clone https://repos.goffi.org/sat_pubsub && ~/libervia_env/bin/pip install -e sat_pubsub && \ - mv sat_pubsub/sat_pubsub.egg-info ~/libervia_env/lib/python3.*/site-packages + mv sat_pubsub/libervia_pubsub.egg-info ~/libervia_env/lib/python3.*/site-packages ENTRYPOINT ["/home/libervia/entrypoint.sh"] From cf5213d4fe6796023dbef9bb59f9d18be4aadc62 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 2 Aug 2021 21:47:22 +0200 Subject: [PATCH 4/4] plugin XEP-0346: fix deprecated import --- sat/plugins/plugin_xep_0346.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sat/plugins/plugin_xep_0346.py b/sat/plugins/plugin_xep_0346.py index c5e81ae9..1d4e5c78 100644 --- a/sat/plugins/plugin_xep_0346.py +++ b/sat/plugins/plugin_xep_0346.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from collections import Iterable +from collections.abc import Iterable import itertools from typing import Optional from zope.interface import implementer