From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 59D903858D39; Thu, 5 Jan 2023 16:30:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59D903858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672936245; bh=JvhKI+jBnAGB9AQtaUiW0GxDI//rM2rSEISObnx5dyA=; h=To:Subject:Date:From:From; b=ViwjE9tcARaUHGdaknDCP+XuVFPjSkonjtbpPBtqH0wnQ03duhf4z/yZxvGjn/mAK lw+PixCTc2O0RlDDXbASuw9awUHoFRQanhJbsYjfYKMNosq90Lo3CX8J9VdZ/H4cW1 j9VgMeDOAQrmyXRjsVi+gCwN3YBQbHfuVqp382nA= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20221205-7-ga7c7e07 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8413b769e25cd02472b14f11fc41e00d642c9028 X-Git-Newrev: a7c7e071b30ea9172e3bff9d8cd33fa62900f0ff Message-Id: <20230105163045.59D903858D39@sourceware.org> Date: Thu, 5 Jan 2023 16:30:45 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=a7c7e071b30ea9172e3bff9d8cd33fa62900f0ff commit a7c7e071b30ea9172e3bff9d8cd33fa62900f0ff Author: Jon Turney Date: Thu Jan 5 14:20:25 2023 +0000 Allow an empty source for obsoleted catgets package Allow an empty source for obsoleted catgets package, so libcatgets1 can get properly identified as a deprecated soversion. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=7f1cdcf8fab90149448a9d734bb44a1539c2a6e3 commit 7f1cdcf8fab90149448a9d734bb44a1539c2a6e3 Author: Jon Turney Date: Mon Jan 2 17:06:16 2023 +0000 CI: Update deprecated GitHub actions https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=36f62caeb71476f0a401569f90f64c465593220c commit 36f62caeb71476f0a401569f90f64c465593220c Author: Jon Turney Date: Tue Jan 3 13:07:08 2023 +0000 Drop special case to handle libturbojpeg as a solib package Drop special case to handle libturbojpeg as a solib package, since it got expired. Diff: --- .github/workflows/calm.yaml | 7 ++++--- calm/common_constants.py | 2 +- calm/past_mistakes.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/calm.yaml b/.github/workflows/calm.yaml index 3e65dd6..3120598 100644 --- a/.github/workflows/calm.yaml +++ b/.github/workflows/calm.yaml @@ -8,14 +8,15 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/calm/common_constants.py b/calm/common_constants.py index 5adfe91..cc43009 100644 --- a/calm/common_constants.py +++ b/calm/common_constants.py @@ -91,4 +91,4 @@ PACKAGE_COMPRESSIONS_RE = r'\.(' + '|'.join(PACKAGE_COMPRESSIONS) + r')' # inspecting the contents (but that's expensive to do). for the moment, we # recognize soversion packages by the simple heuristic of looking at the package # name -SOVERSION_PACKAGE_RE = r'^(lib|girepository-).*[\d_.]+$|^libflint$|^libturbojpeg$' +SOVERSION_PACKAGE_RE = r'^(lib|girepository-).*[\d_.]+$|^libflint$' diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index 0edf8ba..5cd85a7 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -168,6 +168,7 @@ nonexistent_provides = [ # depends on it's replacement, and so are a lingering remnant of something not # properly obsoleted) empty_source = { + 'catgets-src': ['2.10.0-1'], 'octave-octcdf-src': ['1.1.7-99'], 'perl-File-Slurp-Unicode-src': ['0.7.1-2'], # obsoleted by perl-File-Slurp }