Philipp Hörist pushed to branch master at gajim / gajim

Commits:

5 changed files:

Changes:

  • README.md
    ... ... @@ -9,7 +9,6 @@
    9 9
     - gir1.2-gtk-3.0 (>=3.22)
    
    10 10
     - python3-nbxmpp
    
    11 11
     - python3-openssl (>=0.14)
    
    12
    -- python3-pyasn1
    
    13 12
     
    
    14 13
     
    
    15 14
     ### Optional Runtime Requirements
    

  • org.gajim.Gajim.json
    ... ... @@ -204,20 +204,6 @@
    204 204
                 ]
    
    205 205
             },
    
    206 206
             {
    
    207
    -            "name": "python3-pyasn1",
    
    208
    -            "buildsystem": "simple",
    
    209
    -            "build-commands": [
    
    210
    -                "pip3 install --prefix=/app pyasn1-0.4.2-py2.py3-none-any.whl"
    
    211
    -            ],
    
    212
    -            "sources": [
    
    213
    -                {
    
    214
    -                    "type": "file",
    
    215
    -                    "url": "https://pypi.python.org/packages/ba/fe/02e3e2ee243966b143657fb8bd6bc97595841163b6d8c26820944acaec4d/pyasn1-0.4.2-py2.py3-none-any.whl",
    
    216
    -                    "sha256": "d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1"
    
    217
    -                }
    
    218
    -            ]
    
    219
    -        },
    
    220
    -        {
    
    221 207
                 "name": "python3-dbus-python",
    
    222 208
                 "sources": [
    
    223 209
                     {
    

  • setup.py
    ... ... @@ -287,7 +287,6 @@ setup(
    287 287
         install_requires=[
    
    288 288
             'nbxmpp>=0.6.5',
    
    289 289
             'pyOpenSSL>=0.12',
    
    290
    -        'pyasn1',
    
    291 290
         ],
    
    292 291
         extras_require={
    
    293 292
             'secret_password': ["keyring"]
    

  • win/_base.sh
    ... ... @@ -85,7 +85,6 @@ function install_deps {
    85 85
         build_pip install setuptools_scm
    
    86 86
     
    
    87 87
         PIP_REQUIREMENTS="\
    
    88
    -pyasn1
    
    89 88
     certifi
    
    90 89
     git+https://dev.gajim.org/gajim/python-nbxmpp.git
    
    91 90
     git+https://github.com/dlitz/pycrypto.git
    

  • win/dev_env.sh
    ... ... @@ -19,7 +19,6 @@ function main {
    19 19
         pip3 install setuptools_scm
    
    20 20
     
    
    21 21
         PIP_REQUIREMENTS="\
    
    22
    -pyasn1
    
    23 22
     certifi
    
    24 23
     git+https://dev.gajim.org/gajim/python-nbxmpp.git
    
    25 24
     git+https://dev.gajim.org/lovetox/pybonjour-python3.git