Skip to content

Commit

Permalink
Merge pull request #8 from regro-cf-autotick-bot/0.25.0_h7bf223
Browse files Browse the repository at this point in the history
pyodide-build v0.25.0
  • Loading branch information
bollwyvl authored Jan 20, 2024
2 parents 5fa38b6 + 69bc2a8 commit 2e19b37
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 20 deletions.
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 23 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 2 additions & 9 deletions recipe/0000-no-cmake-from-pip.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
diff --git a/pyodide-build/pyproject.toml b/pyodide-build/pyproject.toml
index 535d773e..38f87ea2 100644
index 1d0d4b2b..b064058f 100644
--- a/pyodide-build/pyproject.toml
+++ b/pyodide-build/pyproject.toml
@@ -24,13 +24,12 @@ dependencies = [
@@ -24,7 +24,6 @@ dependencies = [
"virtualenv",
"pydantic>=1.10.2,<2",
"pyodide-cli~=0.2.1",
- "cmake>=3.24",
"unearth~=0.6",
"requests",
"types-requests",
"typer",
"auditwheel-emscripten~=0.0.9",
- "pyodide-lock==0.1.0a1",
+ "pyodide-lock>=0.1.0a1,<0.2.0",
"resolvelib",
"rich",
"loky",
10 changes: 5 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "0.24.1" %}
{% set version = "0.25.0" %}

package:
name: pyodide-build
version: {{ version }}

source:
url: https://pypi.io/packages/source/p/pyodide-build/pyodide-build-{{ version }}.tar.gz
sha256: 96a7f41fd249c08fb3ab3abcbe0ef0efe0b0e14ff08f48e922e1a256de676fe9
sha256: 060abf97429a592788393fb9710f4c63b1ff45d14c248f0c710913efe4e70623
patches:
# this _should_ fail if the version of cmake changes below
- 0000-no-cmake-from-pip.patch
Expand All @@ -15,7 +15,7 @@ build:
noarch: python
entry_points:
- pyodide-build = pyodide_build.__main__:main
script: {{ PYTHON }} -m pip install . -vv
script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation
number: 0

requirements:
Expand All @@ -31,8 +31,8 @@ requirements:
- pydantic >=1.10.2,<2
- pyodide-cli >=0.2.1,<0.3.0
- python >=3.10
- python-build ==0.7.0
- pyodide-lock >=0.1.0a1,<0.2.0
- python-build >=1.0.0
- pyodide-lock ==0.1.0a4
- pyyaml
- requests
- resolvelib
Expand Down

0 comments on commit 2e19b37

Please sign in to comment.