From 0f1beb89e961b22b1db875cb9278fc6a28bc50be Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 27 Oct 2014 18:39:32 +0100 Subject: Use a setuptools entry point instead of a custom script --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index aeac3737..6c70c208 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,8 @@ setup(name="poezio", 'poezio_plugins', 'poezio_plugins.gpg', 'poezio_themes'], package_dir = {'poezio': 'src', 'poezio_plugins': 'plugins', 'poezio_themes': 'data/themes'}, package_data = {'poezio': ['default_config.cfg']}, - scripts = ['scripts/poezio', 'scripts/poezio_gpg_export'], + scripts = ['scripts/poezio_gpg_export'], + entry_points={ 'console_scripts': [ 'poezio = poezio:main' ] }, data_files = [('share/man/man1/', ['data/poezio.1'])], install_requires = ['sleekxmpp==1.2.4', -- cgit v1.2.3 From f55ac9edbfbfeb13e93cb101df8d38bd7bcce15a Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 27 Oct 2014 19:16:32 +0100 Subject: Mention that setuptools is kind of mandatory --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6c70c208..efd914b0 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,13 @@ #!/usr/bin/env python3 + try: from setuptools import setup, Extension except ImportError: + print('Setuptools was not found.\n' + 'This script will use distutils instead, which will NOT' + ' be able to install a `poezio` executable.\nIf you are ' + 'using it to build a package or install poezio, please ' + 'install setuptools.\n\nYou will also see a few warnings.\n') from distutils.core import setup, Extension import os -- cgit v1.2.3 From c3aa6c029d67a9612ebabf84784a6571fa603e4c Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 28 Oct 2014 22:12:18 +0100 Subject: Fix the dependencies in the setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index efd914b0..e9e8e4a7 100755 --- a/setup.py +++ b/setup.py @@ -63,8 +63,8 @@ setup(name="poezio", entry_points={ 'console_scripts': [ 'poezio = poezio:main' ] }, data_files = [('share/man/man1/', ['data/poezio.1'])], - install_requires = ['sleekxmpp==1.2.4', - 'dnspython3>=1.11.1'], + install_requires = ['sleekxmpp>=1.2.4', + 'dnspython3>=1.10.0'], extras_require = {'OTR plugin': 'python-potr>=1.0', 'Screen autoaway plugin': 'pyinotify==0.9.4'} ) -- cgit v1.2.3