From 999d630ab1c311b5a8898bc9dc9559d9989a6845 Mon Sep 17 00:00:00 2001 From: Pedro Brochado Date: Tue, 23 Jul 2024 10:02:27 -0300 Subject: [PATCH] Use pygobject provided by centos9 [noissue] --- .ci/scripts/calc_constraints.py | 2 -- .github/workflows/scripts/install.sh | 2 +- requirements.txt | 1 - template_config.yml | 6 ++---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py index ede3fc269..b5be1b1f5 100755 --- a/.ci/scripts/calc_constraints.py +++ b/.ci/scripts/calc_constraints.py @@ -105,8 +105,6 @@ def main(): if line.strip().startswith("#"): # Shortcut comment only lines print(line.strip()) - elif "pygobject" in line.lower(): - print("# Skipping PyGObject.") else: req, comment = split_comment(line) if args.upper: diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 36429b075..334246102 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -86,7 +86,7 @@ cat >> vars/main.yaml << VARSYAML pulp_env: {} pulp_settings: {"allowed_content_checksums": ["sha1", "sha224", "sha256", "sha384", "sha512"], "allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "orphan_protection_time": 0} pulp_scheme: https -pulp_default_container: ghcr.io/pulp/pulp-ci-centos:latest +pulp_default_container: ghcr.io/pulp/pulp-ci-centos9:latest VARSYAML SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "generate-bindings" "lowerbounds") diff --git a/requirements.txt b/requirements.txt index bf24f48c9..3e37f9a0f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,5 @@ jsonschema>=4.6,<5.0 libcomps>=0.1.20.post1,<0.2 productmd~=1.33.0 pulpcore>=3.17,<3.25 -PyGObject>=3.40,<3.45 solv~=0.7.21 aiohttp_xmlrpc~=1.5.0 diff --git a/template_config.yml b/template_config.yml index 52d39f773..dffa66b63 100644 --- a/template_config.yml +++ b/template_config.yml @@ -9,7 +9,7 @@ check_commit_message: true check_gettext: true check_manifest: true check_stray_pulpcore_imports: true -ci_base_image: ghcr.io/pulp/pulp-ci-centos +ci_base_image: ghcr.io/pulp/pulp-ci-centos9 ci_env: {} ci_trigger: '{pull_request: {branches: [''*'']}}' ci_update_docs: false @@ -31,9 +31,7 @@ kanban: true latest_release_branch: null lint_requirements: true noissue_marker: '[noissue]' -os_required_packages: -- libgirepository1.0-dev -- gir1.2-modulemd-2.0 +os_required_packages: [] parallel_test_workers: 8 plugin_app_label: rpm plugin_default_branch: main