Merge lp:~jelmer/brz/setuptools into lp:brz/3.0

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/setuptools
Merge into: lp:brz/3.0
Diff against target: 42 lines (+12/-2)
2 files modified
doc/en/release-notes/brz-3.0.txt (+3/-0)
setup.py (+9/-2)
To merge this branch: bzr merge lp:~jelmer/brz/setuptools
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+363691@code.launchpad.net

Commit message

Use setuptools in setup.py.

Description of the change

Use setuptools in setup.py.

This allows various new options for setup() to be used, such as
install_requires. setuptools is already common enough that this should be fine.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Launchpad doesn't like the branch, but looked at the changes and all seems reasonable. Is possible we want to update some of the other bits (like using pkg_resources for version parsing) but that can be later.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt 2019-02-16 04:21:57 +0000
+++ doc/en/release-notes/brz-3.0.txt 2019-03-04 00:01:07 +0000
@@ -85,6 +85,9 @@
85 longer performed, since there are no longer85 longer performed, since there are no longer
86 any automated imports. (Jelmer Vernooij)86 any automated imports. (Jelmer Vernooij)
8787
88 * ``setuptools`` is now required to build and install Breezy.
89 (Jelmer Vernooij)
90
88New Features91New Features
89************92************
9093
9194
=== modified file 'setup.py'
--- setup.py 2019-02-06 05:44:37 +0000
+++ setup.py 2019-03-04 00:01:07 +0000
@@ -16,6 +16,14 @@
16 sys.stderr.write("[ERROR] Not a supported Python version. Need 2.7+\n")16 sys.stderr.write("[ERROR] Not a supported Python version. Need 2.7+\n")
17 sys.exit(1)17 sys.exit(1)
1818
19
20try:
21 import setuptools
22except ImportError:
23 sys.stderr.write("[ERROR] Please install setuptools\n")
24 sys.exit(1)
25
26
19# NOTE: The directory containing setup.py, whether run by 'python setup.py' or27# NOTE: The directory containing setup.py, whether run by 'python setup.py' or
20# './setup.py' or the equivalent with another path, should always be at the28# './setup.py' or the equivalent with another path, should always be at the
21# start of the path, so this should find the right one...29# start of the path, so this should find the right one...
@@ -118,8 +126,7 @@
118BREEZY['packages'] = get_breezy_packages()126BREEZY['packages'] = get_breezy_packages()
119127
120128
121from distutils import log129from setuptools import setup
122from distutils.core import setup
123from distutils.version import LooseVersion130from distutils.version import LooseVersion
124from distutils.command.install_scripts import install_scripts131from distutils.command.install_scripts import install_scripts
125from distutils.command.install_data import install_data132from distutils.command.install_data import install_data

Subscribers

People subscribed via source and target branches