.gitlab-ci.yml

 before_script:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip
+  - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo
   - sudo apt-get build-dep -y -qq gajim-default-nightly
-  - sudo pip3 install pylint==2.1.1
 
 stages:
   - test
   - build
 
-run-test:
-  stage: test
-  script:
-    - python3 setup.py test -s test.no_gui
-
-run-mypy:
+run-tests:
   stage: test
   script:
+    - rm -rf civenv-master
+    - virtualenv --system-site-packages civenv
+    - . ./civenv/bin/activate
+    - pip3 install mypy
+    - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master
+    - pip3 install pylint==2.1.1
     - mypy gajim
-
-run-pylint:
-  stage: test
-  script:
-    - pylint3 --version
-    - pylint --version
     - scripts/dev/pylint-ci.sh --jobs=2 gajim
+    - python3 setup.py test -s test.no_gui
+    - deactivate
+    - rm -rf civenv-master
 
 run-appdata:
   stage: test
@@ -57,4 +54,4 @@ run-build:
     name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"
     expire_in: 1 week
     paths:
-      - gajim-default-2???-??-??.tar.gz
+      - gajim-default-$CI_COMMIT_SHA.tar.gz

gajim/common/zeroconf/client_zeroconf.py

@@ -240,10 +240,10 @@ def StreamInit(self):
             self.send_stream_header()
 
     def send_stream_header(self):
-        self.Dispatcher._metastream = Node('stream:stream')
+        self.Dispatcher._metastream = nbxmpp.Node('stream:stream')
         self.Dispatcher._metastream.setNamespace(self.Namespace)
         self.Dispatcher._metastream.setAttr('version', '1.0')
-        self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS)
+        self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS)
         self.Dispatcher._metastream.setAttr('from',
             self.conn_holder.zeroconf.name)
         if self.to:
@@ -252,7 +252,7 @@ def send_stream_header(self):
                 self.Dispatcher._metastream)[:-2])
 
     def _check_stream_start(self, ns, tag, attrs):
-        if ns != NS_STREAMS or tag != 'stream':
+        if ns != nbxmpp.NS_STREAMS or tag != 'stream':
             log.error('Incorrect stream start: (%s,%s).Terminating!',
                       tag, ns)
             self.Connection.disconnect()
@@ -266,7 +266,7 @@ def _check_stream_start(self, ns, tag, attrs):
             self.send_stream_header()
             if 'version' in attrs and attrs['version'] == '1.0':
                 # other part supports stream features
-                features = Node('stream:features')
+                features = nbxmpp.Node('stream:features')
                 self.Dispatcher.send(features)
             while self.stanzaqueue:
                 stanza, is_message = self.stanzaqueue.pop(0)

setup.cfg

@@ -19,8 +19,6 @@ classifiers =
 python_requires = >=3.5
 packages = find:
 test_suite = test
-dependency_links=
-    git+https://dev.gajim.org/gajim/python-nbxmpp.git#egg=nbxmpp-0.9.90
 install_requires =
     cssutils>=1.0.2
     keyring