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

Proposed by Jelmer Vernooij on 2019-02-27
Status: Merged
Approved by: Jelmer Vernooij on 2019-03-03
Approved revision: 7292
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 2019-02-27 Approve on 2019-03-03
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.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/release-notes/brz-3.0.txt'
2--- doc/en/release-notes/brz-3.0.txt 2019-02-16 04:21:57 +0000
3+++ doc/en/release-notes/brz-3.0.txt 2019-03-04 00:01:07 +0000
4@@ -85,6 +85,9 @@
5 longer performed, since there are no longer
6 any automated imports. (Jelmer Vernooń≥)
7
8+ * ``setuptools`` is now required to build and install Breezy.
9+ (Jelmer Vernooń≥)
10+
11 New Features
12 ************
13
14
15=== modified file 'setup.py'
16--- setup.py 2019-02-06 05:44:37 +0000
17+++ setup.py 2019-03-04 00:01:07 +0000
18@@ -16,6 +16,14 @@
19 sys.stderr.write("[ERROR] Not a supported Python version. Need 2.7+\n")
20 sys.exit(1)
21
22+
23+try:
24+ import setuptools
25+except ImportError:
26+ sys.stderr.write("[ERROR] Please install setuptools\n")
27+ sys.exit(1)
28+
29+
30 # NOTE: The directory containing setup.py, whether run by 'python setup.py' or
31 # './setup.py' or the equivalent with another path, should always be at the
32 # start of the path, so this should find the right one...
33@@ -118,8 +126,7 @@
34 BREEZY['packages'] = get_breezy_packages()
35
36
37-from distutils import log
38-from distutils.core import setup
39+from setuptools import setup
40 from distutils.version import LooseVersion
41 from distutils.command.install_scripts import install_scripts
42 from distutils.command.install_data import install_data

Subscribers

People subscribed via source and target branches