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

Commits: 3eeed7d2 by André Apitzsch at 2018-10-31T21:47:33Z Setup: move configuration to setup.cfg to improve readability

- - - - -

2 changed files:

- + setup.cfg - setup.py

Changes:

===================================== setup.cfg ===================================== @@ -0,0 +1,43 @@ +[metadata] +name = gajim +version = attr: gajim.__version__ +description = A GTK+ Jabber client +author = Philipp Hörist, Yann Leboulanger +author_email = gajim-devel@gajim.org +url = https://gajim.org +license = GPL v3 +classifiers = + Programming Language :: Python :: 3 + +[options] +python_requires = >=3.5 +packages = find: +install_requires = + cssutils>=1.0.2 + keyring + nbxmpp>=0.6.8,<0.7.0 + precis-i18n>=1.0.0 + pyOpenSSL>=0.12 + +[options.package_data] +gajim = + data/activities/*/*/*.png + data/emoticons/*/*.png + data/emoticons/*/LICENSE + data/gui/*.ui + data/icons/hicolor/*/*/*.png + data/icons/hicolor/*/*/*.svg + data/iconsets/*/*/*.gif + data/iconsets/*/*/*.png + data/iconsets/transports/*/*/*.png + data/moods/*/*.png + data/other/* + data/sounds/*.wav + data/style/*.css + data/plugins/*/* + +[options.packages.find] +exclude = + gajim.dev + test* +

===================================== setup.py ===================================== @@ -15,8 +15,6 @@ from distutils.util import convert_path, newer

import subprocess

-import gajim - pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) MAN_FILES = ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1'] @@ -213,32 +211,6 @@ class update_po(Command): update_trans()

-package_data_activities = ['data/activities/*/*/*.png'] -package_data_emoticons = ['data/emoticons/*/*.png', - 'data/emoticons/*/LICENSE'] -package_data_gui = ['data/gui/*.ui'] -package_data_icons = ['data/icons/hicolor/*/*/*.png', - 'data/icons/hicolor/*/*/*.svg'] -package_data_iconsets = ['data/iconsets/*/*/*.gif', - 'data/iconsets/*/*/*.png', - 'data/iconsets/transports/*/*/*.png'] -package_data_moods = ['data/moods/*/*.png'] -package_data_other = ['data/other/*'] -package_data_sounds = ['data/sounds/*.wav'] -package_data_style = ['data/style/*.css'] -package_plugins_data = ['data/plugins/*/*'] -package_data = (package_data_activities - + package_data_emoticons - + package_data_gui - + package_data_icons - + package_data_iconsets - + package_data_moods - + package_data_other - + package_data_sounds - + package_data_style - + package_plugins_data) - - # only install subdirectories of data data_files_app_icon = [ ("share/icons/hicolor/64x64/apps", @@ -254,16 +226,6 @@ data_files_app_icon = [ data_files = data_files_app_icon

setup( - name="gajim", - description='A GTK+ Jabber client', - version=gajim.__version__, - author="Philipp Hörist, Yann Leboulanger", - author_email="gajim-devel@gajim.org", - url='https://gajim.org', - license='GPL v3', - classifiers=[ - 'Programming Language :: Python :: 3', - ], cmdclass={ 'build_py': build, 'install': install, @@ -280,14 +242,5 @@ setup( 'gajim-history-manager = gajim.history_manager:main', ] }, - packages=find_packages(exclude=["gajim.dev", "test*"]), - package_data={'gajim': package_data}, - data_files=data_files, - install_requires=[ - 'keyring', - 'nbxmpp>=0.6.8,<0.7.0', - 'pyOpenSSL>=0.12', - 'cssutils>=1.0.2', - 'precis-i18n>=1.0.0', - ] + data_files=data_files )

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3eeed7d2b4c8acf3c7bc10e7d17254e8f3e...