From 38f79620bb0074ad160ca632bb980f94690902bc Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 13 Nov 2017 11:41:42 +0100 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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