From f78148707747f18d45e668b79ab488f711cc6bec Mon Sep 17 00:00:00 2001 From: Matus Kocka Date: Mon, 10 Apr 2017 23:48:04 +0200 Subject: [PATCH 01/24] Adding README.md with deps --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..995f8f9 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +python2 dependencies +==================== + +build dependencies calculated by brt_dep_solver +----------------------------------------------- +autoconf +compat-openssl10 +expat +findutils +libX11 +mesa +tcl +tix +tk +valgrind + + +runtime dependencies calculated by brt_dep_solver +------------------------------------------------- +coreutils +glibc + From be4d0713cba91200178be058e98c80805550a2f4 Mon Sep 17 00:00:00 2001 From: mkocka Date: Tue, 11 Apr 2017 10:36:50 +0200 Subject: [PATCH 02/24] python ver 2.6 --- python26.yaml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 python26.yaml diff --git a/python26.yaml b/python26.yaml new file mode 100644 index 0000000..940a6b9 --- /dev/null +++ b/python26.yaml @@ -0,0 +1,37 @@ +data: + api: + rpms: + - python26 + components: + rpms: + autoconf: {rationale: Build dependency.} + compat-openssl10: {rationale: Build dependency.} + coreutils: {rationale: Runtime dependency.} + expat: {rationale: Build dependency.} + findutils: {rationale: Build dependency.} + glibc: {rationale: Runtime dependency.} + libX11: {rationale: Build dependency.} + mesa: {rationale: Build dependency.} + tcl: {rationale: Build dependency.} + tix: {rationale: Build dependency.} + tk: {rationale: Build dependency.} + valgrind: {rationale: Build dependency.} + description: 'Python 2.6 package for developers. + + + This package exists to allow developers to test their code against an older + + version of Python. This is not a full Python stack and if you wish to run + + your applications with Python 2.6, see other distributions + + that support it, such as CentOS or RHEL 6.' + filter: {} + license: + module: [Python] + name: '' + stream: '' + summary: Version 2.6 of the Python programming language + version: 0 +document: modulemd +version: 1 From b8e6b7e7db660f66822842c4debe826076028299 Mon Sep 17 00:00:00 2001 From: mkocka Date: Thu, 11 May 2017 10:36:25 +0200 Subject: [PATCH 03/24] new version of modulemd file --- python2.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ python26.yaml | 37 ------------------------------------- 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 python2.yaml delete mode 100644 python26.yaml diff --git a/python2.yaml b/python2.yaml new file mode 100644 index 0000000..037cde4 --- /dev/null +++ b/python2.yaml @@ -0,0 +1,45 @@ +document: modulemd +version: 1 +data: + summary: Python2 programming language + description: Python 2 version of Python programming language. + license: + module: [Python] + dependencies: + buildrequires: + base-runtime: f26 + common-build-dependencies: f26 + shared-userspace: f26 + requires: + shared-userspace: f26 + base-runtime: f26 + references: + community: https://fedoraproject.org/wiki/Modularity + documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules + tracker: https://taiga.fedorainfracloud.org/project/modularity + profiles: + default: + rpms: + - python2 + api: + rpms: + - python2 + components: + rpms: + python2: + rationale: Python2 package. + ref: f26 + buildorder: 10 +# autoconf: {rationale: Build dependency.} +# compat-openssl10: {rationale: Build dependency.} +# coreutils: {rationale: Runtime dependency.} +# expat: {rationale: Build dependency.} +# findutils: {rationale: Build dependency.} +# glibc: {rationale: Runtime dependency.} +# libX11: {rationale: Build dependency.} +# mesa: {rationale: Build dependency.} +# tcl: {rationale: Build dependency.} +# tix: {rationale: Build dependency.} +# tk: {rationale: Build dependency.} +# valgrind: {rationale: Build dependency.} + diff --git a/python26.yaml b/python26.yaml deleted file mode 100644 index 940a6b9..0000000 --- a/python26.yaml +++ /dev/null @@ -1,37 +0,0 @@ -data: - api: - rpms: - - python26 - components: - rpms: - autoconf: {rationale: Build dependency.} - compat-openssl10: {rationale: Build dependency.} - coreutils: {rationale: Runtime dependency.} - expat: {rationale: Build dependency.} - findutils: {rationale: Build dependency.} - glibc: {rationale: Runtime dependency.} - libX11: {rationale: Build dependency.} - mesa: {rationale: Build dependency.} - tcl: {rationale: Build dependency.} - tix: {rationale: Build dependency.} - tk: {rationale: Build dependency.} - valgrind: {rationale: Build dependency.} - description: 'Python 2.6 package for developers. - - - This package exists to allow developers to test their code against an older - - version of Python. This is not a full Python stack and if you wish to run - - your applications with Python 2.6, see other distributions - - that support it, such as CentOS or RHEL 6.' - filter: {} - license: - module: [Python] - name: '' - stream: '' - summary: Version 2.6 of the Python programming language - version: 0 -document: modulemd -version: 1 From 0621873ea171689c11d2af941e19a805d0c5255a Mon Sep 17 00:00:00 2001 From: mkocka Date: Sat, 13 May 2017 21:18:43 +0200 Subject: [PATCH 04/24] adding perl --- python2.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python2.yaml b/python2.yaml index 037cde4..89e38bc 100644 --- a/python2.yaml +++ b/python2.yaml @@ -10,9 +10,11 @@ data: base-runtime: f26 common-build-dependencies: f26 shared-userspace: f26 + perl: f26 requires: shared-userspace: f26 base-runtime: f26 + perl: f26 references: community: https://fedoraproject.org/wiki/Modularity documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules From 67f46e31fe23b676bdacb5cac4b2c229aa3acad4 Mon Sep 17 00:00:00 2001 From: mkocka Date: Sat, 13 May 2017 23:10:12 +0200 Subject: [PATCH 05/24] adding bootstrap --- python2.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index 89e38bc..2aac5bd 100644 --- a/python2.yaml +++ b/python2.yaml @@ -7,7 +7,8 @@ data: module: [Python] dependencies: buildrequires: - base-runtime: f26 +# base-runtime: f26 + bootstrap: f26 common-build-dependencies: f26 shared-userspace: f26 perl: f26 From bded12340922fa7aae973f571de794fb19e57c32 Mon Sep 17 00:00:00 2001 From: mkocka Date: Sat, 13 May 2017 23:40:16 +0200 Subject: [PATCH 06/24] removing bootstrap --- python2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python2.yaml b/python2.yaml index 2aac5bd..5c930db 100644 --- a/python2.yaml +++ b/python2.yaml @@ -7,8 +7,8 @@ data: module: [Python] dependencies: buildrequires: -# base-runtime: f26 - bootstrap: f26 + base-runtime: f26 +# bootstrap: f26 common-build-dependencies: f26 shared-userspace: f26 perl: f26 From 17adf73a0c4aee9025e6432d126b4bef5365c554 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 1 Aug 2017 14:31:59 +0200 Subject: [PATCH 07/24] remove trailing whitespace --- python2.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python2.yaml b/python2.yaml index 5c930db..e18f084 100644 --- a/python2.yaml +++ b/python2.yaml @@ -1,14 +1,14 @@ document: modulemd version: 1 data: - summary: Python2 programming language + summary: Python2 programming language description: Python 2 version of Python programming language. license: module: [Python] dependencies: buildrequires: - base-runtime: f26 -# bootstrap: f26 + base-runtime: f26 +# bootstrap: f26 common-build-dependencies: f26 shared-userspace: f26 perl: f26 From 88be063ec837b12bd152cd24920baf90e4680d73 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 1 Aug 2017 14:31:17 +0200 Subject: [PATCH 08/24] update references --- python2.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python2.yaml b/python2.yaml index e18f084..0b13762 100644 --- a/python2.yaml +++ b/python2.yaml @@ -17,9 +17,9 @@ data: base-runtime: f26 perl: f26 references: - community: https://fedoraproject.org/wiki/Modularity - documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules - tracker: https://taiga.fedorainfracloud.org/project/modularity + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/python2 + tracker: https://github.com/modularity-modules/python2/issues profiles: default: rpms: From 8cc2a4cc8e98886534c9cf3c1439638b6367bf4d Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Mon, 4 Sep 2017 11:06:52 +0200 Subject: [PATCH 09/24] First version of a working modulemd --- python2.yaml | 116 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 31 deletions(-) diff --git a/python2.yaml b/python2.yaml index 0b13762..c9d2573 100644 --- a/python2.yaml +++ b/python2.yaml @@ -1,48 +1,102 @@ document: modulemd version: 1 data: - summary: Python2 programming language - description: Python 2 version of Python programming language. + summary: Python programming language, version 2 + description: >- + Python is an interpreted, interactive, object-oriented programming + language often compared to Tcl, Perl, Scheme or Java. Python includes + modules, classes, exceptions, very high level dynamic data types + and dynamic typing. Python supports interfaces to many system calls and + libraries, as well as to various windowing systems (X11, Motif, Tk, + Mac and MFC). + + Programmers can write new built-in modules for Python in C or C++. + Python can be used as an extension language for applications that + need a programmable interface. license: - module: [Python] + module: + - MIT dependencies: buildrequires: - base-runtime: f26 -# bootstrap: f26 - common-build-dependencies: f26 - shared-userspace: f26 - perl: f26 + bootstrap: master + + # Need an already built Python interpreter + python2-bootstrap: master + + # python2-devel buildrequires python3-rpm-generators which + # requires python3 and python3-setuptools + python3: master + + # tk-devel buildrequires /usr/bin/perl + perl: master requires: - shared-userspace: f26 - base-runtime: f26 - perl: f26 + platform: master + platform-placeholder: master references: - community: https://docs.pagure.org/modularity/ - documentation: https://github.com/modularity-modules/python2 - tracker: https://github.com/modularity-modules/python2/issues + community: https://www.python.org/ + documentation: https://docs.python.org/2/ + tracker: https://pkgs.fedoraproject.org/modules/python2 profiles: + minimal: + rpms: + - python2 + - python2-libs + - python2-pip + - python2-setuptools default: rpms: - python2 + - python2-libs + - python2-pip + - python2-setuptools + - python2-tools + full: + rpms: + - python2 + - python2-debug + - python2-debuginfo + - python2-debugsource + - python2-devel + - python2-libs + - python2-pip + - python2-setuptools + - python2-tools + - python2-wheel + filter: + rpms: + - python2-tkinter api: rpms: - - python2 + - python2 + - python2-debug + - python2-devel + - python2-libs + - python2-pip + - python2-setuptools + - python2-tools + - python2-wheel + buildopts: + rpms: + macros: | + # setuptools & pip & wheel + %_without_python3 1 + # setuptools + %_without_platform_python 1 components: rpms: - python2: - rationale: Python2 package. - ref: f26 + python-wheel: + rationale: Used for unbundling of pip and setuptools + ref: master buildorder: 10 -# autoconf: {rationale: Build dependency.} -# compat-openssl10: {rationale: Build dependency.} -# coreutils: {rationale: Runtime dependency.} -# expat: {rationale: Build dependency.} -# findutils: {rationale: Build dependency.} -# glibc: {rationale: Runtime dependency.} -# libX11: {rationale: Build dependency.} -# mesa: {rationale: Build dependency.} -# tcl: {rationale: Build dependency.} -# tix: {rationale: Build dependency.} -# tk: {rationale: Build dependency.} -# valgrind: {rationale: Build dependency.} - + python-setuptools: + rationale: Python Packaging ecosystem + ref: master + buildorder: 20 + python-pip: + rationale: Python Packaging ecosystem + ref: master + buildorder: 30 + python2: + rationale: Main Python language interpreter + ref: master + buildorder: 40 From 16f05c9f85fc51ecf9f0b083d9a307fb5d51fca1 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Mon, 4 Sep 2017 19:28:00 +0200 Subject: [PATCH 10/24] Rebuild module From 85f1f101a4b640905f4769076c5e1fc27f0db613 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 5 Sep 2017 10:20:34 +0200 Subject: [PATCH 11/24] Need to build python3 as well as python2 version of some packages Explanation in the added commend under buildopts.rpms.macros. --- python2.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/python2.yaml b/python2.yaml index c9d2573..6d029e2 100644 --- a/python2.yaml +++ b/python2.yaml @@ -65,6 +65,9 @@ data: filter: rpms: - python2-tkinter + - python3-wheel + - python3-setuptools + - python3-pip api: rpms: - python2 @@ -78,10 +81,17 @@ data: buildopts: rpms: macros: | - # setuptools & pip & wheel - %_without_python3 1 # setuptools %_without_platform_python 1 + + # Note that we cannot disable building of Python 3 subpackages, + # because python2-devel (needed to build all Python 2 packages) + # has a runtime dependency on python3-rpm-generators, and that + # package requires python3-setuptools at runtime. By rebuilding + # python-setuptools SRPM with only python2, we overshadow the + # already built python3 subpackage and it is no longer + # available for python3-rpm-generators when building python-pip + # (or any other Python package). components: rpms: python-wheel: From ade5ea610796cdf5a7ae6cac960b3503c63ea065 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 5 Sep 2017 15:22:56 +0200 Subject: [PATCH 12/24] Remove debuginfo and debugsource from the api --- python2.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/python2.yaml b/python2.yaml index 6d029e2..511e94f 100644 --- a/python2.yaml +++ b/python2.yaml @@ -54,8 +54,6 @@ data: rpms: - python2 - python2-debug - - python2-debuginfo - - python2-debugsource - python2-devel - python2-libs - python2-pip From 3a5f2563bb030102c44798ba1b47d181decdb0a3 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 5 Sep 2017 15:30:24 +0200 Subject: [PATCH 13/24] Update tracker url --- python2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index 511e94f..b2b338c 100644 --- a/python2.yaml +++ b/python2.yaml @@ -35,7 +35,7 @@ data: references: community: https://www.python.org/ documentation: https://docs.python.org/2/ - tracker: https://pkgs.fedoraproject.org/modules/python2 + tracker: https://src.fedoraproject.org/modules/python2 profiles: minimal: rpms: From b3c12033faaee299c72175ed458c705d00985b9b Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 19 Sep 2017 16:42:17 +0200 Subject: [PATCH 14/24] Add python-rpm-macros component --- python2.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python2.yaml b/python2.yaml index b2b338c..badc176 100644 --- a/python2.yaml +++ b/python2.yaml @@ -66,6 +66,7 @@ data: - python3-wheel - python3-setuptools - python3-pip + - python3-rpm-generators api: rpms: - python2 @@ -92,6 +93,10 @@ data: # (or any other Python package). components: rpms: + python-rpm-macros: + rationale: Build and runtime dependency of python2-devel + ref: master + buildorder: 10 python-wheel: rationale: Used for unbundling of pip and setuptools ref: master From 8a7cdcea3076c41c91138a55308512453fc49323 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 19 Sep 2017 17:59:57 +0200 Subject: [PATCH 15/24] Remove dependency on now deprecated platform-placeholder module --- python2.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index badc176..9ec1b82 100644 --- a/python2.yaml +++ b/python2.yaml @@ -31,7 +31,6 @@ data: perl: master requires: platform: master - platform-placeholder: master references: community: https://www.python.org/ documentation: https://docs.python.org/2/ From 6e445081325bbb3df930339c3c5a9c6ba890a115 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 13:35:06 +0200 Subject: [PATCH 16/24] Add runtime module dependency on python3 due to needing python3-rpm-generators --- python2.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index 9ec1b82..a3a5535 100644 --- a/python2.yaml +++ b/python2.yaml @@ -23,7 +23,7 @@ data: # Need an already built Python interpreter python2-bootstrap: master - # python2-devel buildrequires python3-rpm-generators which + # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools python3: master @@ -31,6 +31,10 @@ data: perl: master requires: platform: master + + # python2-devel requires python3-rpm-generators which + # requires python3 and python3-setuptools + python3: master references: community: https://www.python.org/ documentation: https://docs.python.org/2/ From 31170cdf6d1089e3783d5020cc827eab77210b68 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 13:37:06 +0200 Subject: [PATCH 17/24] Disabled build deps other than bootstrap until we builddep on platform instead of bootstrap --- python2.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python2.yaml b/python2.yaml index a3a5535..1383eb0 100644 --- a/python2.yaml +++ b/python2.yaml @@ -21,11 +21,15 @@ data: bootstrap: master # Need an already built Python interpreter - python2-bootstrap: master + # python2-bootstrap: master + # Disabled since python2-bootstrap requires platform, and + # bootstrap and platform modules conflict # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools - python3: master + # python3: master + # Disabled since python3 requires platform, and + # bootstrap and platform modules conflict # tk-devel buildrequires /usr/bin/perl perl: master From d1bee73963fc03b940d2554c7316c000ee728ad6 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 13:51:56 +0200 Subject: [PATCH 18/24] Disabled one more forgotten builddep --- python2.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index 1383eb0..b95896a 100644 --- a/python2.yaml +++ b/python2.yaml @@ -32,7 +32,9 @@ data: # bootstrap and platform modules conflict # tk-devel buildrequires /usr/bin/perl - perl: master + # perl: master + # Disabled since perl requires platform, and + # bootstrap and platform modules conflict requires: platform: master From 764045c752ef962e206cb8f0fbbd0a50244028cd Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 15:21:34 +0200 Subject: [PATCH 19/24] Filter python3-rpm-macros from the module --- python2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2.yaml b/python2.yaml index b95896a..63ece9f 100644 --- a/python2.yaml +++ b/python2.yaml @@ -75,7 +75,7 @@ data: - python3-wheel - python3-setuptools - python3-pip - - python3-rpm-generators + - python3-rpm-macros api: rpms: - python2 From a39f02e879539a25db1f3a301db856e98d4c63e7 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 3 Oct 2017 17:01:25 +0200 Subject: [PATCH 20/24] Filter out tools, test and debug subpackages due to missing tkinter --- python2.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/python2.yaml b/python2.yaml index 63ece9f..c6cb04d 100644 --- a/python2.yaml +++ b/python2.yaml @@ -58,20 +58,27 @@ data: - python2-libs - python2-pip - python2-setuptools - - python2-tools full: rpms: - python2 - - python2-debug - python2-devel - python2-libs - python2-pip - python2-setuptools - - python2-tools - python2-wheel filter: rpms: + # Requires unavailable: tk, tcl, libX11 - python2-tkinter + # Requires unavailable: python3-tkinter + - python2-tools + # Requires unavailable: python3-tools + - python2-test + # Requires unavailable: python3-{tkinter,tools,test} and more + - python2-debug + + # Remove Python 3 stuff we had to build but don't want in the + # module - python3-wheel - python3-setuptools - python3-pip @@ -79,12 +86,10 @@ data: api: rpms: - python2 - - python2-debug - python2-devel - python2-libs - python2-pip - python2-setuptools - - python2-tools - python2-wheel buildopts: rpms: From 38f79620bb0074ad160ca632bb980f94690902bc Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 13 Nov 2017 11:41:42 +0100 Subject: [PATCH 21/24] we need to require f27 as the base --- python2.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python2.yaml b/python2.yaml index c6cb04d..555552e 100644 --- a/python2.yaml +++ b/python2.yaml @@ -18,7 +18,7 @@ data: - MIT dependencies: buildrequires: - bootstrap: master + bootstrap: f27 # Need an already built Python interpreter # python2-bootstrap: master @@ -36,11 +36,11 @@ data: # Disabled since perl requires platform, and # bootstrap and platform modules conflict requires: - platform: master + platform: f27 # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools - python3: master + python3: 3.6 references: community: https://www.python.org/ documentation: https://docs.python.org/2/ From 3db6cbf0abae3e5eb2f1c852a61613417b01a6c6 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Wed, 7 Mar 2018 17:48:13 +0100 Subject: [PATCH 22/24] Update buildrequires to platform: f28 --- python2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python2.yaml b/python2.yaml index 555552e..be4c872 100644 --- a/python2.yaml +++ b/python2.yaml @@ -18,7 +18,7 @@ data: - MIT dependencies: buildrequires: - bootstrap: f27 + platform: f28 # Need an already built Python interpreter # python2-bootstrap: master @@ -36,7 +36,7 @@ data: # Disabled since perl requires platform, and # bootstrap and platform modules conflict requires: - platform: f27 + platform: f28 # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools From 2af3f58d03fecae62353e8449121974fbe298f78 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Wed, 14 Mar 2018 17:42:34 +0100 Subject: [PATCH 23/24] Remove extra buildtime/runtime deps since they should be in host&platform --- python2.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/python2.yaml b/python2.yaml index be4c872..3fdba0f 100644 --- a/python2.yaml +++ b/python2.yaml @@ -19,28 +19,8 @@ data: dependencies: buildrequires: platform: f28 - - # Need an already built Python interpreter - # python2-bootstrap: master - # Disabled since python2-bootstrap requires platform, and - # bootstrap and platform modules conflict - - # python2-devel requires python3-rpm-generators which - # requires python3 and python3-setuptools - # python3: master - # Disabled since python3 requires platform, and - # bootstrap and platform modules conflict - - # tk-devel buildrequires /usr/bin/perl - # perl: master - # Disabled since perl requires platform, and - # bootstrap and platform modules conflict requires: platform: f28 - - # python2-devel requires python3-rpm-generators which - # requires python3 and python3-setuptools - python3: 3.6 references: community: https://www.python.org/ documentation: https://docs.python.org/2/ From 1ee5e273ebe3ff2280cb9c7b1fdfa71c0f3556aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Aug 2018 15:46:27 +0200 Subject: [PATCH 24/24] This module was just an attempt and is not compatible with the current modularity --- .gitignore | 0 README.md | 22 ----------- dead.package | 1 + python2.yaml | 109 --------------------------------------------------- sources | 0 5 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 python2.yaml delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md deleted file mode 100644 index 995f8f9..0000000 --- a/README.md +++ /dev/null @@ -1,22 +0,0 @@ -python2 dependencies -==================== - -build dependencies calculated by brt_dep_solver ------------------------------------------------ -autoconf -compat-openssl10 -expat -findutils -libX11 -mesa -tcl -tix -tk -valgrind - - -runtime dependencies calculated by brt_dep_solver -------------------------------------------------- -coreutils -glibc - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a3ac9b8 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This module was just an attempt and is not compatible with the current modularity diff --git a/python2.yaml b/python2.yaml deleted file mode 100644 index 3fdba0f..0000000 --- a/python2.yaml +++ /dev/null @@ -1,109 +0,0 @@ -document: modulemd -version: 1 -data: - summary: Python programming language, version 2 - description: >- - Python is an interpreted, interactive, object-oriented programming - language often compared to Tcl, Perl, Scheme or Java. Python includes - modules, classes, exceptions, very high level dynamic data types - and dynamic typing. Python supports interfaces to many system calls and - libraries, as well as to various windowing systems (X11, Motif, Tk, - Mac and MFC). - - Programmers can write new built-in modules for Python in C or C++. - Python can be used as an extension language for applications that - need a programmable interface. - license: - module: - - MIT - dependencies: - buildrequires: - platform: f28 - requires: - platform: f28 - references: - community: https://www.python.org/ - documentation: https://docs.python.org/2/ - tracker: https://src.fedoraproject.org/modules/python2 - profiles: - minimal: - rpms: - - python2 - - python2-libs - - python2-pip - - python2-setuptools - default: - rpms: - - python2 - - python2-libs - - python2-pip - - python2-setuptools - full: - rpms: - - python2 - - python2-devel - - python2-libs - - python2-pip - - python2-setuptools - - python2-wheel - filter: - rpms: - # Requires unavailable: tk, tcl, libX11 - - python2-tkinter - # Requires unavailable: python3-tkinter - - python2-tools - # Requires unavailable: python3-tools - - python2-test - # Requires unavailable: python3-{tkinter,tools,test} and more - - python2-debug - - # Remove Python 3 stuff we had to build but don't want in the - # module - - python3-wheel - - python3-setuptools - - python3-pip - - python3-rpm-macros - api: - rpms: - - python2 - - python2-devel - - python2-libs - - python2-pip - - python2-setuptools - - python2-wheel - buildopts: - rpms: - macros: | - # setuptools - %_without_platform_python 1 - - # Note that we cannot disable building of Python 3 subpackages, - # because python2-devel (needed to build all Python 2 packages) - # has a runtime dependency on python3-rpm-generators, and that - # package requires python3-setuptools at runtime. By rebuilding - # python-setuptools SRPM with only python2, we overshadow the - # already built python3 subpackage and it is no longer - # available for python3-rpm-generators when building python-pip - # (or any other Python package). - components: - rpms: - python-rpm-macros: - rationale: Build and runtime dependency of python2-devel - ref: master - buildorder: 10 - python-wheel: - rationale: Used for unbundling of pip and setuptools - ref: master - buildorder: 10 - python-setuptools: - rationale: Python Packaging ecosystem - ref: master - buildorder: 20 - python-pip: - rationale: Python Packaging ecosystem - ref: master - buildorder: 30 - python2: - rationale: Main Python language interpreter - ref: master - buildorder: 40 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000