summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-17 14:12:56 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-20 10:47:29 +0000
commite885a05f273cf0dda181d4a4cda22be2949fece3 (patch)
tree0956f2922045abed5f79339957d1944d0dbcab6b
parent87df3c1fca6771141fd045785e8118289e6503d6 (diff)
downloaddefinitions-e885a05f273cf0dda181d4a4cda22be2949fece3.tar.gz
Use patched version of setuptools 7.0
There are two versions of setuptools, a bitbucket branch[1] and a 0.6 branch that lives in sandbox on svn.python.org[2] 0.6 is still maintained but most active development happens on bitbucket. This patch moves us onto using setuptools from bitbucket. We have patched setuptools to allow our import tool to get information on build dependencies from python packages. A pull request for our setuptools patch has been submitted upstream[3] Since there seems to be a bug in setuptools' master branch that prevents setuptools from being bootstrapped correctly, we are for the moment based off 7.0 (the most recent release of setuptools) [1]: https://bitbucket.org/pypa/setuptools [2]: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/ [3]: https://bitbucket.org/pypa/setuptools/pull-request/106/make-egg_info-command-write-out-setup/diff
-rw-r--r--strata/core.morph6
1 files changed, 3 insertions, 3 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 0a8122fd..37133fee 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -279,9 +279,9 @@ chunks:
- texinfo-tarball
- name: python-setuptools
morph: strata/core/python-setuptools.morph
- repo: upstream:python-setuptools
- ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
- unpetrify-ref: baserock/morph
+ repo: upstream:python-setuptools-bitbucket
+ ref: 0aa6a4de5931d02876428388678802db2371fd37
+ unpetrify-ref: baserock/master
build-depends:
- cpython
- name: pyyaml