Mercurial > libervia-backend
changeset 3615:909b56b115ff
merge branch "@"
author | Goffi <goffi@goffi.org> |
---|---|
date | Mon, 02 Aug 2021 21:49:51 +0200 (2021-08-02) |
parents | 21e7d46b988c (current diff) 422049bb81d3 (diff) |
children | 59d6d4afebf2 |
files | sat/VERSION sat/plugins/plugin_xep_0346.py |
diffstat | 5 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 29 22:51:01 2021 +0200 +++ b/.hgtags Mon Aug 02 21:49:51 2021 +0200 @@ -23,3 +23,4 @@ dbf24ba40396ec3f517f8f7855531d24d0ee701f 0.7.0b3 86bfdf73d24a7a1b7f56abdf5ca51552c6e41101 0.7.0b4 c7138e9132138f79ba66b0d65c45d45399f55a2b 0.7.0 +efe2445b053c989c73d0f0462cf7543de9d67f1c v0.8.0b1
--- a/docker/backend-dev/Dockerfile Thu Jul 29 22:51:01 2021 +0200 +++ b/docker/backend-dev/Dockerfile Mon Aug 02 21:49:51 2021 +0200 @@ -37,10 +37,10 @@ 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
--- a/docker/libervia-web-dev/Dockerfile Thu Jul 29 22:51:01 2021 +0200 +++ b/docker/libervia-web-dev/Dockerfile Mon Aug 02 21:49:51 2021 +0200 @@ -11,7 +11,7 @@ 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
--- a/docker/pubsub/Dockerfile Thu Jul 29 22:51:01 2021 +0200 +++ b/docker/pubsub/Dockerfile Mon Aug 02 21:49:51 2021 +0200 @@ -29,6 +29,6 @@ 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"]
--- a/sat/plugins/plugin_xep_0346.py Thu Jul 29 22:51:01 2021 +0200 +++ b/sat/plugins/plugin_xep_0346.py Mon Aug 02 21:49:51 2021 +0200 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from collections import Iterable +from collections.abc import Iterable import itertools from typing import Optional from zope.interface import implementer