diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-09 12:07:06 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:33 +0000 |
| commit | 6fda9a73165019454f57e5bdaaf1d309c9a6f270 (patch) | |
| tree | 2b37c35acbbfb0b8b04fe5dca28c202c331a2423 | |
| parent | 4ca2f44b91027286859a3b25f5c0e48102b2623a (diff) | |
| download | definitions-6fda9a73165019454f57e5bdaaf1d309c9a6f270.tar.gz | |
Move six to core and update it to 1.9.0
| -rw-r--r-- | strata/core.morph | 6 | ||||
| -rw-r--r-- | strata/cross-bootstrap.morph | 8 | ||||
| -rw-r--r-- | strata/django.morph | 11 | ||||
| -rw-r--r-- | strata/morph-utils.morph | 8 | ||||
| -rw-r--r-- | strata/openstack-common.morph | 10 |
5 files changed, 10 insertions, 33 deletions
diff --git a/strata/core.morph b/strata/core.morph index d60e3baf..46fc03c3 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -118,6 +118,12 @@ chunks: unpetrify-ref: libtool-2.4.5 build-depends: - bash +- name: six + repo: upstream:six + ref: 8cfbff6b764af86d825086fa1637aa009e90d75a + unpetrify-ref: 1.9.0 + build-depends: + - cpython - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 9687ac7e..1ef06abc 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -4,11 +4,6 @@ description: The minimal development tools to build a baserock devel system build-depends: - morph: strata/core.morph chunks: -- name: six - repo: upstream:six - ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa - unpetrify-ref: baserock/morph - build-depends: [] - name: groff morph: strata/cross-bootstrap/groff.morph repo: upstream:groff @@ -70,8 +65,7 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: - - six + build-depends: [] - name: morph repo: baserock:baserock/morph ref: 67afd098cd297b769b1341a460d160a2902ba4e4 diff --git a/strata/django.morph b/strata/django.morph index 07f88b8a..cde9fd41 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -9,17 +9,11 @@ chunks: ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb unpetrify-ref: 1.6.8 build-depends: [] -- name: six - repo: upstream:six - ref: 43c2db60d6aab5e3cf397d5126ba04cf60c24435 - unpetrify-ref: 1.8.0 - build-depends: [] - name: django-appconf repo: github:jezdez/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 unpetrify-ref: 0.6 - build-depends: - - six + build-depends: [] - name: django-compressor repo: github:django-compressor/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 @@ -30,8 +24,7 @@ chunks: repo: github:Kronuz/pyScss ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 unpetrify-ref: 1.2.1 - build-depends: - - six + build-depends: [] - name: django-pyscss repo: github:fusionbox/django-pyscss ref: 665270b54eea5de5aca379a78673b411ed6b1f04 diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 4e28f48a..95e3e452 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -21,18 +21,12 @@ chunks: ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph build-depends: [] -- name: six - repo: upstream:six - ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa - unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: - - six + build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 7da88fb3..d2f40569 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -47,11 +47,6 @@ chunks: unpetrify-ref: master build-depends: - pytz -- name: six - repo: upstream:six - ref: 43c2db60d6aab5e3cf397d5126ba04cf60c24435 - unpetrify-ref: 1.8.0 - build-depends: [] - name: cryptography morph: strata/openstack-services/cryptography.morph repo: upstream:python-packages/cryptography @@ -59,7 +54,6 @@ chunks: unpetrify-ref: 0.6.1 build-depends: - cffi - - six - name: pyiso8601 repo: upstream:pyiso8601 ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab @@ -82,7 +76,6 @@ chunks: build-depends: - pbr - argparse - - six - name: oslo-config repo: upstream:openstack/oslo-config ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 @@ -90,7 +83,6 @@ chunks: build-depends: - argparse - netaddr - - six - stevedore - name: pyopenssl repo: upstream:python-packages/pyopenssl @@ -104,14 +96,12 @@ chunks: build-depends: - pbr - babel - - six - name: oslo-utils repo: upstream:openstack/oslo-utils ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41 unpetrify-ref: 0.3.0 build-depends: - babel - - six - pyiso8601 - oslo-i18n - name: futures |