Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
59147efa by Philipp Hörist at 2018-12-05T20:43:21Z
Fix pylint errors
- - - - -
b2ecc14c by Philipp Hörist at 2018-12-05T20:43:39Z
Use virtualenv for CI tests
- - - - -
2 changed files:
- .gitlab-ci.yml
- gajim/common/zeroconf/client_zeroconf.py
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -1,28 +1,25 @@
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 nbxmpp
+ - 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_REF_NAME-$CI_COMMIT_SHA.tar.gz
=====================================
gajim/common/zeroconf/client_zeroconf.py
=====================================
@@ -240,10 +240,10 @@ class P2PClient(IdleObject):
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 @@ class P2PClient(IdleObject):
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 @@ class P2PClient(IdleObject):
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)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd1ed59cb...b2ecc14cae3500507dda2361a437d8aa6fe56c9d
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd1ed59cb...b2ecc14cae3500507dda2361a437d8aa6fe56c9d
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
