From 496bfd312da2554f7874922e3f32a06cbb986bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Thu, 17 May 2018 22:42:29 +0200 Subject: [PATCH] Remove pyasn1 dependency its not used anymore --- README.md | 1 - org.gajim.Gajim.json | 14 -------------- setup.py | 1 - win/_base.sh | 1 - win/dev_env.sh | 1 - 5 files changed, 18 deletions(-) diff --git a/README.md b/README.md index 77ade1bea..5d288f35e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ - gir1.2-gtk-3.0 (>=3.22) - python3-nbxmpp - python3-openssl (>=0.14) -- python3-pyasn1 ### Optional Runtime Requirements diff --git a/org.gajim.Gajim.json b/org.gajim.Gajim.json index d97bc9581..29b7e69ec 100644 --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -203,20 +203,6 @@ } ] }, - { - "name": "python3-pyasn1", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app pyasn1-0.4.2-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://pypi.python.org/packages/ba/fe/02e3e2ee243966b143657fb8bd6bc97595841163b6d8c26820944acaec4d/pyasn1-0.4.2-py2.py3-none-any.whl", - "sha256": "d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1" - } - ] - }, { "name": "python3-dbus-python", "sources": [ diff --git a/setup.py b/setup.py index 11c329486..dba270d39 100644 --- a/setup.py +++ b/setup.py @@ -287,7 +287,6 @@ setup( install_requires=[ 'nbxmpp>=0.6.5', 'pyOpenSSL>=0.12', - 'pyasn1', ], extras_require={ 'secret_password': ["keyring"] diff --git a/win/_base.sh b/win/_base.sh index c796d6cdb..233809bd0 100644 --- a/win/_base.sh +++ b/win/_base.sh @@ -85,7 +85,6 @@ function install_deps { build_pip install setuptools_scm PIP_REQUIREMENTS="\ -pyasn1 certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git diff --git a/win/dev_env.sh b/win/dev_env.sh index 9372a94e4..e2d0e37df 100644 --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -19,7 +19,6 @@ function main { pip3 install setuptools_scm PIP_REQUIREMENTS="\ -pyasn1 certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git