summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-06-17 10:55:02 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-09-17 15:25:52 (GMT)
commit5407fd1066c3a4e56d34f5db9e8a7c5d71745937 (patch)
treeb0b2b1ba414d4e5eac8e179367807bc106aaab74
parent2515808d88af152e499595d44d3786b978062713 (diff)
downloaddefinitions-5407fd1066c3a4e56d34f5db9e8a7c5d71745937.tar.gz
Remove pip chunk: its already included in python >2.7.9 and python >3.4
Change-Id: I6f2765bb246243d9fbeca463c93cd6110cb6c796
-rw-r--r--strata/core/cpython.morph1
-rw-r--r--strata/python-core.morph9
2 files changed, 2 insertions, 8 deletions
diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph
index d0c8022..e2f5927 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/cpython.morph
@@ -5,6 +5,7 @@ configure-commands:
- |
./configure --prefix="$PREFIX" \
--enable-shared \
+ --with-ensurepip=upgrade \
--with-system-expat \
--with-system-ffi
post-install-commands:
diff --git a/strata/python-core.morph b/strata/python-core.morph
index b78e083..630a807 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -16,20 +16,13 @@ chunks:
build-system: python-distutils
build-depends:
- python-setuptools
-- name: pip
- repo: upstream:pip
- ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
- unpetrify-ref: baserock/master
- build-system: python-distutils
- build-depends:
- - python-setuptools
- name: pbr
repo: upstream:pbr
ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
unpetrify-ref: 0.10.7
build-system: python-distutils
build-depends:
- - pip
+ - python-setuptools
- name: python-requests
repo: upstream:python-requests
ref: b83131779c701720a9ae9efae78996277d416269