merge changes from main branch

This commit is contained in:
Goffi 2021-06-18 18:19:23 +02:00
commit f6a528dbb4

View file

@ -20,38 +20,40 @@
from setuptools import setup, find_packages
import os
NAME = 'sat'
NAME = "libervia-backend"
# NOTE: directory is still "sat" for compatibility reason, should be changed for 0.9
DIR_NAME = "sat"
install_requires = [
'babel',
'dbus-python',
'html2text',
'babel < 3',
'dbus-python < 1.3',
'html2text < 2020.2',
'jinja2>=2.10.3',
'langid',
'langid < 2',
'lxml >= 3.1.0',
'markdown >= 3.0',
'miniupnpc',
'mutagen',
'netifaces',
'miniupnpc < 2.1',
'mutagen < 2',
'netifaces < 0.12',
'pillow >= 6.0.0',
'progressbar2',
'cryptography',
'pygments',
'pygobject',
'pyopenssl',
'python-dateutil',
'python-potr',
'pyxdg',
'sat_tmp >= 0.7.0a4',
'shortuuid',
'twisted[tls] >= 20.3.0',
'treq',
'urwid >= 1.2.0',
'urwid-satext >= 0.7.0a2',
'wokkel >= 0.7.1',
'omemo >= 0.11.0',
'omemo-backend-signal',
'pyyaml',
'progressbar2 < 3.54',
'cryptography < 3.5',
'pygments < 3',
'pygobject < 3.40.1',
'pyopenssl < 21.0.0',
'python-dateutil < 3',
'python-potr < 1.1',
'pyxdg < 0.30',
'sat_tmp >= 0.8.0b1, < 0.9',
'shortuuid < 1.1',
'twisted[tls] >= 20.3.0, < 21.3.0',
'treq < 22.0.0',
'urwid >= 1.2.0, < 3',
'urwid-satext >= 0.8.0b1, < 0.9',
'wokkel >= 18.0.0, < 19.0.0',
'omemo >= 0.11.0, < 0.13.0',
'omemo-backend-signal < 0.3',
'pyyaml < 5.5.0',
'sqlalchemy >= 1.4',
'aiosqlite',
'txdbus'
@ -63,7 +65,7 @@ extras_require = {
DBUS_DIR = 'dbus-1/services'
DBUS_FILE = 'misc/org.libervia.Libervia.service'
with open(os.path.join(NAME, 'VERSION')) as f:
with open(os.path.join(DIR_NAME, 'VERSION')) as f:
VERSION = f.read().strip()
is_dev_version = VERSION.endswith('D')
if is_dev_version:
@ -140,4 +142,4 @@ setup(
extras_require=extras_require,
package_data={"sat": ["VERSION"]},
python_requires=">=3.7",
)
)