Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
-
59147efa
by Philipp Hörist at 2018-12-05T20:43:21Z
-
b2ecc14c
by Philipp Hörist at 2018-12-05T20:43:39Z
2 changed files:
Changes:
| 1 | 1 |
before_script:
|
| 2 |
- - 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
|
|
| 2 |
+ - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo
|
|
| 3 | 3 |
- sudo apt-get build-dep -y -qq gajim-default-nightly
|
| 4 |
- - sudo pip3 install pylint==2.1.1
|
|
| 5 | 4 |
|
| 6 | 5 |
stages:
|
| 7 | 6 |
- test
|
| 8 | 7 |
- build
|
| 9 | 8 |
|
| 10 |
-run-test:
|
|
| 11 |
- stage: test
|
|
| 12 |
- script:
|
|
| 13 |
- - python3 setup.py test -s test.no_gui
|
|
| 14 |
- |
|
| 15 |
-run-mypy:
|
|
| 9 |
+run-tests:
|
|
| 16 | 10 |
stage: test
|
| 17 | 11 |
script:
|
| 12 |
+ - rm -rf civenv-master
|
|
| 13 |
+ - virtualenv --system-site-packages civenv
|
|
| 14 |
+ - . ./civenv/bin/activate
|
|
| 15 |
+ - pip3 install mypy
|
|
| 16 |
+ - pip3 install nbxmpp
|
|
| 17 |
+ - pip3 install pylint==2.1.1
|
|
| 18 | 18 |
- mypy gajim
|
| 19 |
- |
|
| 20 |
-run-pylint:
|
|
| 21 |
- stage: test
|
|
| 22 |
- script:
|
|
| 23 |
- - pylint3 --version
|
|
| 24 |
- - pylint --version
|
|
| 25 | 19 |
- scripts/dev/pylint-ci.sh --jobs=2 gajim
|
| 20 |
+ - python3 setup.py test -s test.no_gui
|
|
| 21 |
+ - deactivate
|
|
| 22 |
+ - rm -rf civenv-master
|
|
| 26 | 23 |
|
| 27 | 24 |
run-appdata:
|
| 28 | 25 |
stage: test
|
| ... | ... | @@ -57,4 +54,4 @@ run-build: |
| 57 | 54 |
name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"
|
| 58 | 55 |
expire_in: 1 week
|
| 59 | 56 |
paths:
|
| 60 |
- - gajim-default-2???-??-??.tar.gz
|
|
| 57 |
+ - gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA.tar.gz
|
| ... | ... | @@ -240,10 +240,10 @@ class P2PClient(IdleObject): |
| 240 | 240 |
self.send_stream_header()
|
| 241 | 241 |
|
| 242 | 242 |
def send_stream_header(self):
|
| 243 |
- self.Dispatcher._metastream = Node('stream:stream')
|
|
| 243 |
+ self.Dispatcher._metastream = nbxmpp.Node('stream:stream')
|
|
| 244 | 244 |
self.Dispatcher._metastream.setNamespace(self.Namespace)
|
| 245 | 245 |
self.Dispatcher._metastream.setAttr('version', '1.0')
|
| 246 |
- self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS)
|
|
| 246 |
+ self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS)
|
|
| 247 | 247 |
self.Dispatcher._metastream.setAttr('from',
|
| 248 | 248 |
self.conn_holder.zeroconf.name)
|
| 249 | 249 |
if self.to:
|
| ... | ... | @@ -252,7 +252,7 @@ class P2PClient(IdleObject): |
| 252 | 252 |
self.Dispatcher._metastream)[:-2])
|
| 253 | 253 |
|
| 254 | 254 |
def _check_stream_start(self, ns, tag, attrs):
|
| 255 |
- if ns != NS_STREAMS or tag != 'stream':
|
|
| 255 |
+ if ns != nbxmpp.NS_STREAMS or tag != 'stream':
|
|
| 256 | 256 |
log.error('Incorrect stream start: (%s,%s).Terminating!',
|
| 257 | 257 |
tag, ns)
|
| 258 | 258 |
self.Connection.disconnect()
|
| ... | ... | @@ -266,7 +266,7 @@ class P2PClient(IdleObject): |
| 266 | 266 |
self.send_stream_header()
|
| 267 | 267 |
if 'version' in attrs and attrs['version'] == '1.0':
|
| 268 | 268 |
# other part supports stream features
|
| 269 |
- features = Node('stream:features')
|
|
| 269 |
+ features = nbxmpp.Node('stream:features')
|
|
| 270 | 270 |
self.Dispatcher.send(features)
|
| 271 | 271 |
while self.stanzaqueue:
|
| 272 | 272 |
stanza, is_message = self.stanzaqueue.pop(0)
|