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.

Sign up for GitHub

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

pyodide-build v0.24.0 #6

Merged
merged 4 commits into from
Sep 16, 2023
Merged

pyodide-build v0.24.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62bec39
updated v0.24.0
regro-cf-autotick-bot Sep 14, 2023
ff5ac5b
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and co…
regro-cf-autotick-bot Sep 14, 2023
947d113
update cmake patch, deps
bollwyvl Sep 15, 2023
4dd9b57
update patch for pyodide-lock alphas
bollwyvl Sep 16, 2023
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
5 changes: 0 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

30 changes: 19 additions & 11 deletions recipe/0000-no-cmake-from-pip.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
--- setup.cfg 2023-02-11 13:22:04.989379640 -0600
+++ setup.cfg 2023-02-11 13:22:14.693162999 -0600
@@ -30,7 +30,7 @@
virtualenv
pydantic>=1.10.2
pyodide-cli~=0.2.1
- cmake>=3.24
+ # cmake>=3.24
unearth~=0.6
requests
types-requests
diff --git a/pyodide-build/pyproject.toml b/pyodide-build/pyproject.toml
index 535d773e..38f87ea2 100644
--- a/pyodide-build/pyproject.toml
+++ b/pyodide-build/pyproject.toml
@@ -24,13 +24,12 @@ 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",
5 changes: 3 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "0.23.4" %}
{% set version = "0.24.0" %}

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

source:
url: https://pypi.io/packages/source/p/pyodide-build/pyodide-build-{{ version }}.tar.gz
sha256: fbb23f93af39d563c9fbdf656ae663035a9a4e8f470f589674a76f9aab6441d9
sha256: 84eb1b9072c20d438ccfc273fc38ee32f74544e7a52023510326639add071fdc
patches:
# this _should_ fail if the version of cmake changes below
- 0000-no-cmake-from-pip.patch
Expand All @@ -32,6 +32,7 @@ requirements:
- pyodide-cli >=0.2.1,<0.3.0
- python >=3.10
- python-build ==0.7.0
- pyodide-lock >=0.1.0a1,<0.2.0
- pyyaml
- requests
- resolvelib
Expand Down