From 9dde2d6f1493493fa2fd557cf864578832aba7d9 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 26 Apr 2024 19:40:41 -0400 Subject: [PATCH] migrate(pipx, venv) (#6004) * migrate(pipx, venv) suggested by @felipecrs ([here](https://github.com/pkgxdev/pantry/commit/587441621e2d68f35349380e69a8b253f7164f3c#commitcomment-141416453)) so we don't lock users of these packages out of newer pythons (now that 3.12 is reasonably well-supported). * link to venv/lib * venv is picky --- projects/pypa.github.io/pipx/package.yml | 12 ++++++++---- projects/virtualenv.pypa.io/package.yml | 16 +++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/projects/pypa.github.io/pipx/package.yml b/projects/pypa.github.io/pipx/package.yml index bb4134ad..945b8995 100644 --- a/projects/pypa.github.io/pipx/package.yml +++ b/projects/pypa.github.io/pipx/package.yml @@ -6,13 +6,17 @@ versions: github: pypa/pipx dependencies: - python.org: '>=3<3.12' + pkgx.sh: ^1 build: - python-venv.sh "{{prefix}}"/bin/pipx + dependencies: + python.org: '>=3<3.12' + script: + - bkpyvenv stage '{{prefix}}' {{version}} + - ${{prefix}}/venv/bin/pip install . + - bkpyvenv seal '{{prefix}}' pipx -test: - pipx run pycowsay moooo! +test: pipx run pycowsay moooo! provides: - bin/pipx diff --git a/projects/virtualenv.pypa.io/package.yml b/projects/virtualenv.pypa.io/package.yml index 6d92c189..fb9bf718 100644 --- a/projects/virtualenv.pypa.io/package.yml +++ b/projects/virtualenv.pypa.io/package.yml @@ -3,14 +3,24 @@ distributable: strip-components: 1 versions: - github: pypa/virtualenv/releases/tags # reads github *releases* but uses the tags of those releases + github: pypa/virtualenv/releases/tags # reads github *releases* but uses the tags of those releases strip: /^v/ dependencies: - python.org: '>=3.7<3.12' + pkgx.sh: ^1 + libexpat.github.io: ^2 + openssl.org: ^1.1 build: - python-venv.sh {{prefix}}/bin/virtualenv + dependencies: + python.org: '>=3.7<3.12' + script: + - bkpyvenv stage '{{prefix}}' {{version}} + - ${{prefix}}/venv/bin/pip install . + - bkpyvenv seal '{{prefix}}' virtualenv + # needs this to find its libpython on linux + - run: cp '{{deps.python.org.prefix}}/lib/libpython'* . + working-directory: '{{prefix}}/lib' test: script: |