-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
automerged PR by conda-forge/automerge-action
- Loading branch information
Showing
3 changed files
with
16 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
cdt_name: | ||
- cos6 | ||
- cos7 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,14 @@ | ||
diff --git a/pyodide-build/pyproject.toml b/pyodide-build/pyproject.toml | ||
index 1d0d4b2b..b064058f 100644 | ||
--- a/pyodide-build/pyproject.toml | ||
+++ b/pyodide-build/pyproject.toml | ||
@@ -24,7 +24,6 @@ dependencies = [ | ||
"virtualenv", | ||
"pydantic>=1.10.2,<2", | ||
"pyodide-cli~=0.2.1", | ||
diff --git a/pyproject.toml b/pyproject.toml | ||
index 5c32ccb..02cc591 100644 | ||
--- a/pyproject.toml | ||
+++ b/pyproject.toml | ||
@@ -19,7 +19,8 @@ dependencies = [ | ||
"pyodide-lock==0.1.0a6", | ||
"auditwheel-emscripten~=0.0.9", | ||
"pydantic>=2,<3", | ||
- "cmake>=3.24", | ||
"unearth~=0.6", | ||
"requests", | ||
"types-requests", | ||
+ # conda-forge: use real cmake package | ||
+ # "cmake>=3.24", | ||
"wheel", | ||
"ruamel.yaml", | ||
"packaging", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters