Skip to content

Commit

Permalink
Inherit install from setuptools
Browse files Browse the repository at this point in the history
Should fix Travis build.
  • Loading branch information
unbrice committed Oct 4, 2015
1 parent 50f8b2f commit 3e0199e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ sudo: false
install:
- pip install --use-wheel -r build-requirements.txt
- pip install --use-wheel coveralls
- pip install --use-wheel --upgrade setuptools
script:
- coverage run --source=py1 setup.py test
# Checks that pip can install the package.
Expand Down
12 changes: 7 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# POSSIBILITY OF SUCH DAMAGE.

from distutils.command import build as upstream_build
from distutils.command import install as upstream_install
from setuptools.command import install as upstream_install
import setuptools
from sphinx import setup_command as sphinx_command

Expand All @@ -33,6 +33,7 @@

class build(upstream_build.build):
"""Builds man pages and spinx doc as well."""

sub_commands = upstream_build.build.sub_commands + [
('build_man', None),
('build_sphinx', None),
Expand All @@ -41,10 +42,11 @@ class build(upstream_build.build):

class install(upstream_install.install):
"""Builds man pages and spinx doc before to install."""
sub_commands = upstream_install.install.sub_commands + [
('build_man', None),
('build_sphinx', None),
]

def run(self):
self.run_command('build_man')
self.run_command('build_sphinx')
super().run()


setuptools.setup(
Expand Down

0 comments on commit 3e0199e

Please sign in to comment.