From 3d1830ec13f7b1da5bd799664ca49b682016e39a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 12 Sep 2014 18:48:25 +0200 Subject: Remove explicit package_data from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 857fb5a32..2c553b71f 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,6 @@ try: setuptools.setup( packages=setuptools.find_packages(exclude=['qutebrowser.test']), include_package_data=True, - package_data={'qutebrowser': ['html/*', 'git-commit-id']}, entry_points={'gui_scripts': ['qutebrowser = qutebrowser.qutebrowser:main']}, test_suite='qutebrowser.test', -- cgit v1.2.3-54-g00ecf From 42e8e800aa2c31d3f067d12e75e7eb39cee90e12 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 22 Sep 2014 07:07:09 +0200 Subject: Start patching setuptools commands --- scripts/setupcommon.py | 18 ++++++++++++++++++ setup.py | 14 ++++++++++++++ 2 files changed, 32 insertions(+) (limited to 'setup.py') diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py index 89ab8e81c..7ecd331d8 100644 --- a/scripts/setupcommon.py +++ b/scripts/setupcommon.py @@ -92,6 +92,24 @@ def write_git_file(): f.write(gitstr) +def patch_docgen(cls): + """Class decorator to patch a setuptool command to generate docs. + + Based on: + http://www.niteoweb.com/blog/setuptools-run-custom-code-during-install + """ + + orig_run = cls.run + + def run(*args, **kwargs): + from scripts import asciidoc2html + asciidoc2html.main(colors=False) + return orig_run(*args, **kwargs) + + cls.run = run + return cls + + setupdata = { 'name': 'qutebrowser', 'version': '.'.join(map(str, _get_constant('version_info'))), diff --git a/setup.py b/setup.py index 2c553b71f..a20daae03 100755 --- a/setup.py +++ b/setup.py @@ -29,6 +29,11 @@ from scripts import setupcommon as common from scripts import ez_setup ez_setup.use_setuptools() import setuptools +from setuptools.command.sdist import sdist as cmd_sdist +from setuptools.command.bdist_rpm import bdist_rpm as cmd_bdist_rpm +from setuptools.command.bdist_wininst import bdist_wininst as cmd_bdist_wininst +from setuptools.command.bdist_egg import bdist_egg as cmd_bdist_egg +from setuptools.command.develop import develop as cmd_develop try: @@ -37,6 +42,14 @@ except NameError: BASEDIR = None +command_classes = {} +command_classes['sdist'] = common.patch_docgen(cmd_sdist) +command_classes['bdist_rpm'] = common.patch_docgen(cmd_bdist_rpm) +command_classes['bdist_wininst'] = common.patch_docgen(cmd_bdist_wininst) +command_classes['bdist_egg'] = common.patch_docgen(cmd_bdist_egg) +command_classes['develop'] = common.patch_docgen(cmd_develop) + + try: common.write_git_file() setuptools.setup( @@ -50,6 +63,7 @@ try: extras_require={'nice-debugging': ['colorlog', 'colorama'], 'checks': ['flake8', 'pylint', 'check-manifest', 'pyroma']}, + cmdclass=command_classes, **common.setupdata ) finally: -- cgit v1.2.3-54-g00ecf From e552b62feb7c03ccd33aeaddd1595aa6f24b3cb7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 22 Sep 2014 18:31:19 +0200 Subject: Revert "Start patching setuptools commands" This reverts commit 42e8e800aa2c31d3f067d12e75e7eb39cee90e12. --- scripts/setupcommon.py | 18 ------------------ setup.py | 14 -------------- 2 files changed, 32 deletions(-) (limited to 'setup.py') diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py index 7ecd331d8..89ab8e81c 100644 --- a/scripts/setupcommon.py +++ b/scripts/setupcommon.py @@ -92,24 +92,6 @@ def write_git_file(): f.write(gitstr) -def patch_docgen(cls): - """Class decorator to patch a setuptool command to generate docs. - - Based on: - http://www.niteoweb.com/blog/setuptools-run-custom-code-during-install - """ - - orig_run = cls.run - - def run(*args, **kwargs): - from scripts import asciidoc2html - asciidoc2html.main(colors=False) - return orig_run(*args, **kwargs) - - cls.run = run - return cls - - setupdata = { 'name': 'qutebrowser', 'version': '.'.join(map(str, _get_constant('version_info'))), diff --git a/setup.py b/setup.py index a20daae03..2c553b71f 100755 --- a/setup.py +++ b/setup.py @@ -29,11 +29,6 @@ from scripts import setupcommon as common from scripts import ez_setup ez_setup.use_setuptools() import setuptools -from setuptools.command.sdist import sdist as cmd_sdist -from setuptools.command.bdist_rpm import bdist_rpm as cmd_bdist_rpm -from setuptools.command.bdist_wininst import bdist_wininst as cmd_bdist_wininst -from setuptools.command.bdist_egg import bdist_egg as cmd_bdist_egg -from setuptools.command.develop import develop as cmd_develop try: @@ -42,14 +37,6 @@ except NameError: BASEDIR = None -command_classes = {} -command_classes['sdist'] = common.patch_docgen(cmd_sdist) -command_classes['bdist_rpm'] = common.patch_docgen(cmd_bdist_rpm) -command_classes['bdist_wininst'] = common.patch_docgen(cmd_bdist_wininst) -command_classes['bdist_egg'] = common.patch_docgen(cmd_bdist_egg) -command_classes['develop'] = common.patch_docgen(cmd_develop) - - try: common.write_git_file() setuptools.setup( @@ -63,7 +50,6 @@ try: extras_require={'nice-debugging': ['colorlog', 'colorama'], 'checks': ['flake8', 'pylint', 'check-manifest', 'pyroma']}, - cmdclass=command_classes, **common.setupdata ) finally: -- cgit v1.2.3-54-g00ecf