From 6c52843d71cf6e74c101909f9a763facb38a898f Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Fri, 4 Dec 2020 18:55:55 +0100
Subject: XEP-0363: Add 0363 to the extension list

---
 doap.xml                    | 8 ++++++++
 slixmpp/plugins/__init__.py | 1 +
 2 files changed, 9 insertions(+)

diff --git a/doap.xml b/doap.xml
index 70b72373..e8db8830 100644
--- a/doap.xml
+++ b/doap.xml
@@ -520,6 +520,14 @@
             <xmpp:since>NEXT</xmpp:since>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>1.0.0</xmpp:version>
+            <xmpp:since>1.4.1</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0369.html"/>
diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py
index 4c3235f1..f948ead6 100644
--- a/slixmpp/plugins/__init__.py
+++ b/slixmpp/plugins/__init__.py
@@ -86,6 +86,7 @@ __all__ = [
     'xep_0325',  # IoT Systems Control
     'xep_0332',  # HTTP Over XMPP Transport
     'xep_0353',  # Jingle Message Initiation
+    'xep_0363',  # HTTP File Upload
     'xep_0369',  # MIX-CORE
     'xep_0377',  # Spam reporting
     'xep_0403',  # MIX-Presence
-- 
cgit v1.2.3


From fa6fe5e851543175867621da1962f35f4d55828f Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Fri, 4 Dec 2020 19:10:46 +0100
Subject: CI: install aiohttp as well

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a4013b6..e3daa539 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ test:
   script:
     - apt update
     - apt install -y python3 python3-pip cython3 gpg
-    - pip3 install emoji
+    - pip3 install emoji aiohttp
     - ./run_tests.py
 
 trigger_poezio:
-- 
cgit v1.2.3