Skip to content

Commit

Permalink
Revert "Start patching setuptools commands"
Browse files Browse the repository at this point in the history
This reverts commit 42e8e80.
  • Loading branch information
The-Compiler committed Sep 22, 2014
1 parent 42e8e80 commit e552b62
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
18 changes: 0 additions & 18 deletions scripts/setupcommon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))),
Expand Down
14 changes: 0 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
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:
Expand All @@ -42,14 +37,6 @@
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(
Expand All @@ -63,7 +50,6 @@
extras_require={'nice-debugging': ['colorlog', 'colorama'],
'checks': ['flake8', 'pylint', 'check-manifest',
'pyroma']},
cmdclass=command_classes,
**common.setupdata
)
finally:
Expand Down

0 comments on commit e552b62

Please sign in to comment.