From 0f28c40ad99fead5cdee6dd7377a62d8babff442 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 13:35:46 +0200 Subject: [PATCH 1/6] Add runtime module dependency on python3-bootstrap due to needing python3-rpm-generators --- python2-bootstrap.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python2-bootstrap.yaml b/python2-bootstrap.yaml index 5c33c8a..683a2c0 100644 --- a/python2-bootstrap.yaml +++ b/python2-bootstrap.yaml @@ -20,7 +20,7 @@ data: buildrequires: bootstrap: master - # python2-devel buildrequires python3-rpm-generators which + # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools # python3-bootstrap: master # Disabled since python3-bootstrap requires platform, and @@ -32,6 +32,10 @@ data: # platform modules conflict requires: platform: master + + # python2-devel requires python3-rpm-generators which + # requires python3 and python3-setuptools + python3-bootstrap: master references: community: https://www.python.org/ documentation: https://docs.python.org/2/ From 8c1305fea15a27ddd49ba9d2f13a690927b4c2d8 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 22 Sep 2017 15:22:13 +0200 Subject: [PATCH 2/6] Filter python3-rpm-macros from the module --- python2-bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2-bootstrap.yaml b/python2-bootstrap.yaml index 683a2c0..707babb 100644 --- a/python2-bootstrap.yaml +++ b/python2-bootstrap.yaml @@ -68,7 +68,7 @@ data: - python2-tkinter - python3-setuptools - python3-pip - - python3-rpm-generators + - python3-rpm-macros api: rpms: - python2 From 69312c2c351b1b364b8a906e17d84889c1c76ef0 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Thu, 8 Mar 2018 08:05:29 +0100 Subject: [PATCH 3/6] Update for F28 --- python2-bootstrap.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/python2-bootstrap.yaml b/python2-bootstrap.yaml index 707babb..dbb962b 100644 --- a/python2-bootstrap.yaml +++ b/python2-bootstrap.yaml @@ -18,20 +18,16 @@ data: - MIT dependencies: buildrequires: - bootstrap: master + bootstrap: f28 # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools - # python3-bootstrap: master - # Disabled since python3-bootstrap requires platform, and - # bootstrap and platform modules conflict + python3-bootstrap: master # tk-devel buildrequires /usr/bin/perl - # perl: master - # Disabled since perl requires platform, and bootstrap and - # platform modules conflict + perl: master requires: - platform: master + platform: f28 # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools From 02543f43673d97ed1381ac3fb386cc4c96150840 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Thu, 8 Mar 2018 08:06:49 +0100 Subject: [PATCH 4/6] Switch from bootstrap to platform as builddep --- python2-bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2-bootstrap.yaml b/python2-bootstrap.yaml index dbb962b..f78b914 100644 --- a/python2-bootstrap.yaml +++ b/python2-bootstrap.yaml @@ -18,7 +18,7 @@ data: - MIT dependencies: buildrequires: - bootstrap: f28 + platform: f28 # python2-devel requires python3-rpm-generators which # requires python3 and python3-setuptools From 7a4c14eb8e9256c4161fd27fb442d3e1dc0dee89 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Thu, 8 Mar 2018 08:08:41 +0100 Subject: [PATCH 5/6] Switch version of perl to 5.26 --- python2-bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2-bootstrap.yaml b/python2-bootstrap.yaml index f78b914..baae7e7 100644 --- a/python2-bootstrap.yaml +++ b/python2-bootstrap.yaml @@ -25,7 +25,7 @@ data: python3-bootstrap: master # tk-devel buildrequires /usr/bin/perl - perl: master + perl: 5.26 requires: platform: f28 From 84d4c93db5d3cbc895ff6d9920d8f12a6d4018e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 29 Aug 2018 15:47:55 +0200 Subject: [PATCH 6/6] This module was just an attempt and is not compatible with the current modularity --- README.md | 3 -- dead.package | 1 + python2-bootstrap.yaml | 106 ----------------------------------------- 3 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 python2-bootstrap.yaml diff --git a/README.md b/README.md deleted file mode 100644 index 33c1586..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# python2-bootstrap - -The python2-bootstrap package \ No newline at end of file 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-bootstrap.yaml b/python2-bootstrap.yaml deleted file mode 100644 index baae7e7..0000000 --- a/python2-bootstrap.yaml +++ /dev/null @@ -1,106 +0,0 @@ -document: modulemd -version: 1 -data: - summary: Bootstrapping module for the 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 - - # python2-devel requires python3-rpm-generators which - # requires python3 and python3-setuptools - python3-bootstrap: master - - # tk-devel buildrequires /usr/bin/perl - perl: 5.26 - requires: - platform: f28 - - # python2-devel requires python3-rpm-generators which - # requires python3 and python3-setuptools - python3-bootstrap: master - references: - community: https://www.python.org/ - documentation: https://docs.python.org/2/ - tracker: https://src.fedoraproject.org/modules/python2-bootstrap - 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-devel - - python2-libs - - python2-pip - - python2-setuptools - - python2-tools - filter: - rpms: - - python2-tkinter - - python3-setuptools - - python3-pip - - python3-rpm-macros - api: - rpms: - - python2 - - python2-debug - - python2-devel - - python2-libs - - python2-pip - - python2-setuptools - - python2-tools - buildopts: - rpms: - macros: | - # python2 - %_without_rewheel 1 - # setuptools & pip - %_with_bootstrap 1 - # setuptools - %_without_platform_python 1 - # tests for setuptools need pip, which is unavailable - # during bootstrapping - %_without_tests 1 - components: - rpms: - python-rpm-macros: - rationale: Build and runtime dependency of python2-devel - ref: master - buildorder: 0 - python2: - rationale: Main Python language interpreter - ref: master - buildorder: 10 - python-setuptools: - rationale: Python Packaging ecosystem - ref: master - buildorder: 20 - python-pip: - rationale: Python Packaging ecosystem - ref: master - buildorder: 30