erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge branch "@"

Browse source
This commit is contained in:
Goffi 2021-08-02 21:49:51 +02:00
commit 52f3532917
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker/backend-dev/Dockerfile
View file

@ -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

2
docker/libervia-web-dev/Dockerfile
View file

@ -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

2
docker/pubsub/Dockerfile
View file

@ -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"]

2
sat/plugins/plugin_xep_0346.py
View file

@ -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