Philipp Hörist pushed to branch master at gajim / gajim
Commits:
496bfd31 by Philipp Hörist at 2018-05-17T22:42:29+02:00
Remove pyasn1 dependency
its not used anymore
- - - - -
5 changed files:
- README.md
- org.gajim.Gajim.json
- setup.py
- win/_base.sh
- win/dev_env.sh
Changes:
=====================================
README.md
=====================================
--- 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
=====================================
org.gajim.Gajim.json
=====================================
--- a/org.gajim.Gajim.json
+++ b/org.gajim.Gajim.json
@@ -204,20 +204,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": [
{
=====================================
setup.py
=====================================
--- 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"]
=====================================
win/_base.sh
=====================================
--- 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
=====================================
win/dev_env.sh
=====================================
--- 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
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/496bfd312da2554f7874922e3f32a06cbb986bae
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/496bfd312da2554f7874922e3f32a06cbb986bae
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
