From c6998a49487da446f89b8a5707101e51538b3dd6 Mon Sep 17 00:00:00 2001 From: Igor Todorovski Date: Mon, 28 Oct 2024 22:44:29 -0400 Subject: [PATCH 1/4] Add zopen community tools Signed-off-by: Igor Todorovski --- bin/package_build.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/bin/package_build.py b/bin/package_build.py index 45f431b3..30dca1ee 100755 --- a/bin/package_build.py +++ b/bin/package_build.py @@ -349,6 +349,33 @@ def pds(q): DATA.close() print(f"Saved!\nfilename: {q}") +def zopencommunity(): + url = "https://raw.githubusercontent.com/zopencommunity/meta/main/docs/api/zopen_releases_latest.json" + try: + req = requests.get(url) + data = req.json() + if req.status_code == 404: + raise Exception("404 File not found") + except Exception as e: + print("Couldn't pull. Error: ", str(e)) + else: + zopen_list = [] + for release in data['release_data']: + for asset in data['release_data'][release]: + package_info = { + "packageName": release, + "description": f"This is a zopen community port of {release}. Visit https://github.com/zopencommunity/{release}port for more details.", + "version": asset['assets'][0]['version'] + } + zopen_list.append(package_info) + + file_name = 'zopencommunity.json' + file_path = f'{DATA_FILE_LOCATION}/{file_name}' + + with open(file_path, 'w') as file: + json.dump(zopen_list, file, indent=2) + print(f"Saved!\nfilename: {file_name}") + if __name__ == "__main__": try: @@ -380,6 +407,9 @@ def pds(q): elif file == 'RockyLinux' or file == 'rockylinux': print(f"Extracting {file} data ... ") rockylinux() + elif file == 'ZopenCommunity' or file == 'zopencommunity': + print(f"Extracting data for {file} ... ") + zopencommunity() elif file == 'IBM-Validated' or file == 'ibm-validated': print(f"Extracting {file} data ... ") getIBMValidatedOpenSourceList(oskey) @@ -394,6 +424,7 @@ def pds(q): "\n./package_build.py rockylinux\n\t\t\t[if data is from RockyLinux]" "\n./package_build.py ibm-validated\n\t\t\t[if data is from IBM Validated Open Source List]" "\n./package_build.py\n\t\t\t[for displaying this help]\n" + "\n./package_build.py zopencommunity\n\t\t\t[if data is from ZOSOpenCommunity]" "Example:\n./package_build.py RHEL_8_Package_List.json\n./package_build.py debian") print("Thanks for using SDT!") From baa9f98604c3a95989bec72e890a19a128632bfa Mon Sep 17 00:00:00 2001 From: Igor Todorovski Date: Tue, 29 Oct 2024 13:12:39 -0400 Subject: [PATCH 2/4] Fix indenting Signed-off-by: Igor Todorovski --- bin/package_build.py | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bin/package_build.py b/bin/package_build.py index 30dca1ee..44ce245c 100755 --- a/bin/package_build.py +++ b/bin/package_build.py @@ -350,31 +350,31 @@ def pds(q): print(f"Saved!\nfilename: {q}") def zopencommunity(): - url = "https://raw.githubusercontent.com/zopencommunity/meta/main/docs/api/zopen_releases_latest.json" - try: - req = requests.get(url) - data = req.json() - if req.status_code == 404: - raise Exception("404 File not found") - except Exception as e: - print("Couldn't pull. Error: ", str(e)) - else: - zopen_list = [] - for release in data['release_data']: - for asset in data['release_data'][release]: - package_info = { - "packageName": release, - "description": f"This is a zopen community port of {release}. Visit https://github.com/zopencommunity/{release}port for more details.", - "version": asset['assets'][0]['version'] - } - zopen_list.append(package_info) + url = "https://raw.githubusercontent.com/zopencommunity/meta/main/docs/api/zopen_releases_latest.json" + try: + req = requests.get(url) + data = req.json() + if req.status_code == 404: + raise Exception("404 File not found") + except Exception as e: + print("Couldn't pull. Error: ", str(e)) + else: + zopen_list = [] + for release in data['release_data']: + for asset in data['release_data'][release]: + package_info = { + "packageName": release, + "description": f"This is a zopen community port of {release}. Visit https://github.com/zopencommunity/{release}port for more details.", + "version": asset['assets'][0]['version'] + } + zopen_list.append(package_info) - file_name = 'zopencommunity.json' - file_path = f'{DATA_FILE_LOCATION}/{file_name}' + file_name = 'zopencommunity.json' + file_path = f'{DATA_FILE_LOCATION}/{file_name}' - with open(file_path, 'w') as file: - json.dump(zopen_list, file, indent=2) - print(f"Saved!\nfilename: {file_name}") + with open(file_path, 'w') as file: + json.dump(zopen_list, file, indent=2) + print(f"Saved!\nfilename: {file_name}") if __name__ == "__main__": From 67088f186594bed269f42a6ad2b9670021d11e12 Mon Sep 17 00:00:00 2001 From: Igor Todorovski Date: Tue, 29 Oct 2024 13:14:12 -0400 Subject: [PATCH 3/4] Fix indenting Signed-off-by: Igor Todorovski --- bin/package_build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package_build.py b/bin/package_build.py index 44ce245c..c23d2541 100755 --- a/bin/package_build.py +++ b/bin/package_build.py @@ -424,7 +424,7 @@ def zopencommunity(): "\n./package_build.py rockylinux\n\t\t\t[if data is from RockyLinux]" "\n./package_build.py ibm-validated\n\t\t\t[if data is from IBM Validated Open Source List]" "\n./package_build.py\n\t\t\t[for displaying this help]\n" - "\n./package_build.py zopencommunity\n\t\t\t[if data is from ZOSOpenCommunity]" + "\n./package_build.py zopencommunity\n\t\t\t[if data is from zopen community]" "Example:\n./package_build.py RHEL_8_Package_List.json\n./package_build.py debian") print("Thanks for using SDT!") From ae16d6e5ab43feee68943b467f9b76668cdfa726 Mon Sep 17 00:00:00 2001 From: Igor Todorovski Date: Tue, 29 Oct 2024 16:04:34 -0400 Subject: [PATCH 4/4] Add zopen community to supported distros Signed-off-by: Igor Todorovski --- src/config/supported_distros.py.example | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/supported_distros.py.example b/src/config/supported_distros.py.example index 1e0ec262..46b0b705 100644 --- a/src/config/supported_distros.py.example +++ b/src/config/supported_distros.py.example @@ -4,6 +4,7 @@ SUPPORTED_DISTROS = { 'z/OS Rocket Software': 'ZOS_Rocket_Software', 'z/OS Open Mainframe Project': 'ZOS_OMP', 'z/OS from IBM-Z-zOS': 'IBM_Z_zOS' + 'z/OS from zopen community': 'zopencommunity' }, 'IBM Z and LinuxONE Container Registry': { 'Container Images for IBM Z and LinuxONE': 'IBMZ_container_registry'