diff options
author | Florian Bruhin <git@the-compiler.org> | 2014-08-26 19:10:14 +0200 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2014-08-26 19:10:14 +0200 |
commit | d625cde28cdf40c562ebb868a146901e9a72deb9 (patch) | |
tree | ca667470194cfaaaf723b6ed004e9d36c3e018e9 /setup.py | |
parent | 45608ee9f8623640df22a7865936d0d03baaeb19 (diff) | |
download | qutebrowser-d625cde28cdf40c562ebb868a146901e9a72deb9.tar.gz qutebrowser-d625cde28cdf40c562ebb868a146901e9a72deb9.zip |
Clean up imports
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -24,11 +24,11 @@ import os import os.path -from scripts.setupcommon import setupdata, write_git_file +from scripts import setupcommon as common -from scripts.ez_setup import use_setuptools -use_setuptools() -from setuptools import setup, find_packages +from scripts import ez_setup +ez_setup.use_setuptools() +import setuptools try: @@ -38,9 +38,9 @@ except NameError: try: - write_git_file() - setup( - packages=find_packages(exclude=['qutebrowser.test']), + common.write_git_file() + setuptools.setup( + packages=setuptools.find_packages(exclude=['qutebrowser.test']), include_package_data=True, package_data={'qutebrowser': ['html/*', 'git-commit-id']}, entry_points={'gui_scripts': @@ -51,7 +51,7 @@ try: extras_require={'nice-debugging': ['colorlog', 'colorama'], 'checks': ['flake8', 'pylint', 'check-manifest', 'pyroma']}, - **setupdata + **common.setupdata ) finally: if BASEDIR is not None: |