Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python 3.13 priority in 4 packages. #36419

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions libmamba.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: libmamba
version: 2024.10.02
epoch: 1
epoch: 2
description: Cross-Platform Package Manager
copyright:
- license: BSD-3-Clause
Expand All @@ -16,7 +16,7 @@ data:
3.10: "310"
3.11: "311"
3.12: "312"
3.13: "300"
3.13: "313"

environment:
contents:
Expand Down Expand Up @@ -173,13 +173,9 @@ test:
environment:
contents:
packages:
- py3-libmambapy
- python3
- micromamba
- mamba-package
pipeline:
- runs: |
python3 -c "import libmambapy; print(libmambapy.Context)"
- runs: |
micromamba --help
bash -c "micromamba shell init -s bash -p ~/micromamba; source ~/.bashrc; micromamba activate; micromamba install python=3.11 requests -c conda-forge"
Expand Down
30 changes: 25 additions & 5 deletions py3-build.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package:
name: py3-build
version: 1.2.2
epoch: 1
epoch: 2
description: A simple, correct Python build frontend
copyright:
- license: MIT
dependencies:
provider-priority: 0

vars:
import: build
pypi-package: build

data:
Expand All @@ -17,7 +18,7 @@ data:
3.10: "310"
3.11: "311"
3.12: "312"
3.13: "300"
3.13: "313"

environment:
contents:
Expand All @@ -42,8 +43,6 @@ subpackages:
description: ${{vars.pypi-package}} installed for python${{range.key}}
dependencies:
provider-priority: ${{range.value}}
provides:
- py3-${{vars.pypi-package}}
runtime:
- py${{range.key}}-packaging
- py${{range.key}}-pyproject-hooks
Expand All @@ -52,6 +51,12 @@ subpackages:
- uses: py/pip-build-install
with:
python: python${{range.key}}
test:
pipeline:
- uses: python/import
with:
python: python${{range.key}}
import: ${{vars.import}}

- range: py-versions
name: py${{range.key}}-${{vars.pypi-package}}-bin
Expand All @@ -66,6 +71,18 @@ subpackages:
- runs: |
mkdir -p ${{targets.contextdir}}/usr
mv ${{targets.contextdir}}/../py${{range.key}}-${{vars.pypi-package}}/usr/bin ${{targets.contextdir}}/usr
test:
pipeline:
- runs: |
set +x
fail() { echo "FAIL:" "$@"; exit 1; }

set -- pyproject-build --version
ver=${{package.version}}
out=$("$@") || fail "$* exited $?"
echo "$out" | grep -q -wF "$ver" ||
fail "FAIL: '$*' did not contain '$ver': $out"
echo "PASS: '$*' contained '$ver'"

- name: py3-supported-${{vars.pypi-package}}
description: meta package providing ${{vars.pypi-package}} for supported python versions.
Expand All @@ -78,7 +95,10 @@ subpackages:

test:
pipeline:
- runs: python3.12 -c "import ${{vars.pypi-package}}"
- uses: python/import
with:
imports: |
import ${{vars.import}}

update:
enabled: true
Expand Down
23 changes: 3 additions & 20 deletions py3-cairo.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: py3-cairo
version: 1.27.0
epoch: 2
epoch: 3
description: Python3 bindings for the cairo graphics library
copyright:
- license: LGPL-2.0-or-later
Expand All @@ -18,7 +18,7 @@ data:
3.10: "310"
3.11: "311"
3.12: "312"
3.13: "300"
3.13: "313"

environment:
contents:
Expand Down Expand Up @@ -80,7 +80,7 @@ subpackages:
python: python${{range.key}}
import: ${{vars.import}}
- runs: |
include="$(python${{range.key}} -c 'import ${{vars.import}}; print(${{vars.import}}.get_include())')"
include="$(python${{range.key}} -c 'import cairo; print(cairo.get_include())')"
test -f "$include/py3cairo.h"
environment:
contents:
Expand Down Expand Up @@ -114,23 +114,6 @@ subpackages:
python: python3.13
import: ${{vars.import}}

- name: py3-cairo-dev
description: py3-cairo dev
dependencies:
runtime:
- cairo-dev
- py3-cairo
pipeline:
- uses: split/dev
test:
pipeline:
- uses: test/pkgconf
- uses: py/one-python
with:
content: |
include="$(python3 -c 'import ${{vars.import}}; print(${{vars.import}}.get_include())')"
test -f "$include/py3cairo.h"
smoser marked this conversation as resolved.
Show resolved Hide resolved

update:
enabled: true
github:
Expand Down
19 changes: 4 additions & 15 deletions py3-google-apitools.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: py3-google-apitools
version: 0.5.33
epoch: 3
epoch: 4
description: client libraries for humans
copyright:
- license: Apache-2.0
Expand All @@ -14,11 +14,12 @@ vars:

data:
- name: py-versions
## 3.13 does not work in 0.5.33.
## https://github.com/google/apitools/issues/327
items:
3.10: '310'
3.11: '311'
3.12: '312'
3.13: '300'

environment:
contents:
Expand Down Expand Up @@ -75,21 +76,9 @@ subpackages:
mkdir -p ${{targets.contextdir}}/usr/
mv ./cleanup/${{range.key}}/bin ${{targets.contextdir}}/usr/
test:
environment:
contents:
packages:
- apk-tools
pipeline:
- runs: |
apk info -L py${{range.key}}-${{vars.pypi-package}}-bin > "pkg.list"
echo "Please write a test for these:"
grep usr/bin/ pkg.list > bins.list
sed 's,^,> ,' bins.list

while read line; do
echo == /$line ==
/$line --help && echo exited 0 || echo "exited $?"
done < bins.list
gen_client --help

- name: py3-supported-${{vars.pypi-package}}
description: meta package providing ${{vars.pypi-package}} for supported python versions.
Expand Down
Loading