Hello community,
here is the log from the commit of package python-limnoria for openSUSE:Factory
checked in at 2020-01-06 15:23:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-limnoria (Old)
and /work/SRC/openSUSE:Factory/.python-limnoria.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-limnoria"
Mon Jan 6 15:23:13 2020 rev:11 rq:761072 version:2020.01.01
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-limnoria/python-limnoria.changes
2019-12-31 10:28:32.482954992 +0100
+++
/work/SRC/openSUSE:Factory/.python-limnoria.new.6675/python-limnoria.changes
2020-01-06 15:23:13.824513253 +0100
@@ -1,0 +2,8 @@
+Sat Jan 4 13:10:52 UTC 2020 - Atri Bhattacharya <[email protected]>
+
+- Update to version 2020-01-01:
+ + Skip irctest when optional dependencies are not installed.
+- python2 no longer supported; use skip_python2 macro to disable
+ it.
+
+-------------------------------------------------------------------
Old:
----
master-2019-12-21.tar.gz
New:
----
master-2020-01-01.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-limnoria.spec ++++++
--- /var/tmp/diff_new_pack.xODTyj/_old 2020-01-06 15:23:14.368513535 +0100
+++ /var/tmp/diff_new_pack.xODTyj/_new 2020-01-06 15:23:14.368513535 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-limnoria
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,11 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
%define appname limnoria
-%define srcver 2019-12-21
+%define srcver 2020-01-01
Name: python-limnoria
-Version: 2019.12.21
+Version: 2020.01.01
Release: 0
Summary: A modified version of Supybot (an IRC bot and framework)
License: BSD-3-Clause
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xODTyj/_old 2020-01-06 15:23:14.388513545 +0100
+++ /var/tmp/diff_new_pack.xODTyj/_new 2020-01-06 15:23:14.388513545 +0100
@@ -2,7 +2,7 @@
<service name="download_url" mode='localonly'>
<param name="host">github.com</param>
<param name="protocol">https</param>
- <param
name="path">/ProgVal/Limnoria/archive/master-2019-12-21.tar.gz</param>
+ <param
name="path">/ProgVal/Limnoria/archive/master-2020-01-01.tar.gz</param>
</service>
</services>
++++++ master-2019-12-21.tar.gz -> master-2020-01-01.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/.travis.yml
new/Limnoria-master-2020-01-01/.travis.yml
--- old/Limnoria-master-2019-12-21/.travis.yml 2019-12-15 20:20:42.000000000
+0100
+++ new/Limnoria-master-2020-01-01/.travis.yml 2020-01-01 12:07:59.000000000
+0100
@@ -2,36 +2,18 @@
sudo: true
install:
- if [ "$WITH_OPT_DEPS" = "true" ] ; then pip install -vr requirements.txt;
fi
- - if [[ "$TRAVIS_PYTHON_VERSION" =~ ^3\.[4-9] ]] ; then pip install -v
git+https://github.com/ProgVal/irctest.git; fi
+ - pip install -v git+https://github.com/ProgVal/irctest.git
- echo "y" | pip uninstall limnoria || true
# command to run tests, e.g. python setup.py test
script:
- echo $TRAVIS_PYTHON_VERSION
- python setup.py install
- supybot-test test -v --plugins-dir=./plugins/ --no-network
--disable-multiprocessing
- - if [[ "$TRAVIS_PYTHON_VERSION" =~ ^3\.[4-9] ]] ; then python -m irctest
irctest.controllers.limnoria; fi
+ - if [ "$WITH_OPT_DEPS" = "true" ] -a [[ "$TRAVIS_PYTHON_VERSION" =~
^3\.[4-9] ]] ; then python -m irctest irctest.controllers.limnoria; fi
notifications:
email: false
matrix:
include:
- - python: "2.6"
- env: WITH_OPT_DEPS=false
- dist: trusty
- - python: "2.7"
- env: WITH_OPT_DEPS=false
- dist: trusty
- - python: "2.7"
- env: WITH_OPT_DEPS=true
- dist: trusty
- - python: "3.2"
- env: WITH_OPT_DEPS=false
- dist: trusty
- - python: "3.2"
- env: WITH_OPT_DEPS=true
- dist: trusty
- - python: "3.3"
- env: WITH_OPT_DEPS=true
- dist: trusty
- python: "3.4"
env: WITH_OPT_DEPS=true
dist: trusty
@@ -55,10 +37,7 @@
env: WITH_OPT_DEPS=true
dist: xenial
- - python: "pypy"
- env: WITH_OPT_DEPS=true
- dist: trusty
- - python: "pypy3.3-5.2-alpha1"
+ - python: "pypy3"
env: WITH_OPT_DEPS=true
dist: trusty
- python: "pypy3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/README.md
new/Limnoria-master-2020-01-01/README.md
--- old/Limnoria-master-2019-12-21/README.md 2019-12-15 20:20:42.000000000
+0100
+++ new/Limnoria-master-2020-01-01/README.md 2020-01-01 12:07:59.000000000
+0100
@@ -13,9 +13,8 @@
Testing branch: [](https://travis-ci.org/ProgVal/Limnoria)
-Limnoria supports CPython 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, nightly;
-and Pypy 2 and 3. It works best with CPython 3.4 and higher.
-Python 2.5 and older versions are not supported.
+Limnoria supports CPython 3.4, 3.5, 3.6, 3.7, nightly;
+and Pypy 3.
# Support
@@ -27,8 +26,9 @@
TL;DR version:
```
-sudo apt-get install python3 python3-pip
+sudo apt-get install python3 python3-pip python3-wheel
pip3 install --user limnoria
+# You might need to add $HOME/.local/bin to your PATH
supybot-wizard
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/plugins/Config/plugin.py
new/Limnoria-master-2020-01-01/plugins/Config/plugin.py
--- old/Limnoria-master-2019-12-21/plugins/Config/plugin.py 2019-12-15
20:20:42.000000000 +0100
+++ new/Limnoria-master-2020-01-01/plugins/Config/plugin.py 2020-01-01
12:07:59.000000000 +0100
@@ -181,7 +181,7 @@
"""
L = self._list(irc, group)
if L:
- irc.reply(format('%L', L))
+ irc.reply(format('%L', sorted(L)))
else:
irc.error(_('There don\'t seem to be any values in %s.') %
group._name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/requirements.txt
new/Limnoria-master-2020-01-01/requirements.txt
--- old/Limnoria-master-2019-12-21/requirements.txt 2019-12-15
20:20:42.000000000 +0100
+++ new/Limnoria-master-2020-01-01/requirements.txt 2020-01-01
12:07:59.000000000 +0100
@@ -6,4 +6,4 @@
sqlalchemy
PySocks
mock
-ecdsa
+cryptography
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/setup.py
new/Limnoria-master-2020-01-01/setup.py
--- old/Limnoria-master-2019-12-21/setup.py 2019-12-15 20:20:42.000000000
+0100
+++ new/Limnoria-master-2020-01-01/setup.py 2020-01-01 12:07:59.000000000
+0100
@@ -81,8 +81,8 @@
fd.write(' pass\n')
fd.close()
-if sys.version_info < (2, 6, 0):
- sys.stderr.write("Supybot requires Python 2.6 or newer.")
+if sys.version_info < (3, 4, 0):
+ sys.stderr.write("Limnoria requires Python 3.4 or newer.")
sys.stderr.write(os.linesep)
sys.exit(-1)
@@ -206,13 +206,10 @@
'Operating System :: OS Independent',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.2',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
'Topic :: Communications :: Chat :: Internet Relay Chat',
'Topic :: Software Development :: Libraries :: Python Modules',
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Limnoria-master-2019-12-21/src/irclib.py
new/Limnoria-master-2020-01-01/src/irclib.py
--- old/Limnoria-master-2019-12-21/src/irclib.py 2019-12-15
20:20:42.000000000 +0100
+++ new/Limnoria-master-2020-01-01/src/irclib.py 2020-01-01
12:07:59.000000000 +0100
@@ -36,9 +36,16 @@
import collections
try:
- import ecdsa
+ class crypto:
+ import cryptography
+ from cryptography.hazmat.primitives.serialization \
+ import load_pem_private_key
+ from cryptography.hazmat.backends import default_backend
+ from cryptography.hazmat.primitives.asymmetric.ec import ECDSA
+ from cryptography.hazmat.primitives.asymmetric.utils import Prehashed
+ from cryptography.hazmat.primitives.hashes import SHA256
except ImportError:
- ecdsa = None
+ crypto = None
try:
import pyxmpp2_scram as scram
@@ -1042,7 +1049,8 @@
for mechanism in network_config.sasl.mechanisms():
if mechanism == 'ecdsa-nist256p-challenge' and \
- ecdsa and self.sasl_username and self.sasl_ecdsa_key:
+ crypto and self.sasl_username and \
+ self.sasl_ecdsa_key:
self.sasl_next_mechanisms.append(mechanism)
elif mechanism == 'external' and (
network_config.certfile() or
@@ -1171,12 +1179,15 @@
if string == b'':
self.sendSaslString(self.sasl_username.encode('utf-8'))
return
+
try:
- with open(self.sasl_ecdsa_key) as fd:
- private_key = ecdsa.SigningKey.from_pem(fd.read())
- authstring = private_key.sign(string)
+ with open(self.sasl_ecdsa_key, 'rb') as fd:
+ private_key = crypto.load_pem_private_key(
+ fd.read(),password=None, backend=crypto.default_backend())
+ authstring = private_key.sign(
+ string, crypto.ECDSA(crypto.Prehashed(crypto.SHA256())))
self.sendSaslString(authstring)
- except (ecdsa.BadDigestError, OSError, ValueError):
+ except (OSError, ValueError):
self.sendMsg(ircmsgs.IrcMsg(command='AUTHENTICATE',
args=('*',)))
self.tryNextSaslMechanism()
