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

emscripten-3.1.73 minor changes #1529

Merged
merged 10 commits into from
Jan 13, 2025
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/run_with_pixi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ jobs:
with:
pixi-version: v0.20.1
- run: |
pixi run setup
# pixi run setup
pixi run build-emscripten-wasm32-pkg recipes/recipes_emscripten/regex
pixi run build-emscripten-wasm32-pkg test_recipes/only_py_tests
2 changes: 1 addition & 1 deletion ci_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- python
- ruamel.yaml
- typer
- rattler-build >=0.18.1
- rattler-build >=0.34.1
- pixi
- jinja2
- curl
Expand Down
10 changes: 5 additions & 5 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ c_compiler:
then:
- clang



cxx_compiler:
- if: emscripten
then:
Expand Down Expand Up @@ -310,6 +308,8 @@ davix:
- '0.8'
dbus:
- 1
emscripten_emscripten-wasm32:
- 3.1.73
exiv2:
- 0.27
expat:
Expand Down Expand Up @@ -528,7 +528,7 @@ ntl:
- '11.4.3'
# we build for the oldest version possible of numpy for forward compatibility
numpy:
- 1.25.2
- '2.2'
occt:
- '7.5'
openblas:
Expand Down Expand Up @@ -577,7 +577,7 @@ pybind11_abi:
pip:
- '24.0.*'
python:
- 3.13.* *_cpython
- 3.13.* *_cp313
# # part of a zip_keys: python, python_impl, numpy
# - 3.7.* *_cpython # [not (osx and arm64)]
# - 3.8.* *_cpython
Expand All @@ -589,7 +589,7 @@ python_impl:
# - cpython # [not (osx and arm64)]
# - cpython
pytester:
- 1.0.12
- 1.0.18
qt:
- 5.12
qtkeychain:
Expand Down
12 changes: 6 additions & 6 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ platforms = ["osx-arm64", "osx-64", "linux-64"]
############################################
[feature.feature_rattler_build]
[feature.feature_rattler_build.dependencies]
rattler-build = ">=0.18.1"
rattler-build = ">=0.34.1"
python = "3.11.*"
typer = "*"
curl = "*"
Expand All @@ -26,7 +26,7 @@ cmd = [
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
"--skip-existing", "all",
"-m", "conda_build_config.yaml",
"--recipe",
"recipes/recipes/emscripten_emscripten-wasm32"
Expand All @@ -41,7 +41,7 @@ cmd = [
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
"--skip-existing", "all",
"-m", "conda_build_config.yaml",
"--recipe",
"recipes/recipes/cross-python_emscripten-wasm32"
Expand All @@ -56,7 +56,7 @@ cmd = [
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
"--skip-existing", "all",
"-m", "conda_build_config.yaml",
"--recipe",
"recipes/recipes/pytester"
Expand All @@ -77,7 +77,7 @@ cmd = [
"-c", "microsoft",
"-c", "conda-forge",
"--target-platform", "emscripten-wasm32",
"--skip-existing", "local",
"--skip-existing", "all",
"-m", "conda_build_config.yaml",
"--recipe"
]
Expand All @@ -91,7 +91,7 @@ cmd = [
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
"--skip-existing", "all",
"-m", "conda_build_config.yaml",
"--recipe"
]
Expand Down
6 changes: 3 additions & 3 deletions recipes/recipes/pytester/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
context:
version: '1.0.14'
version: '1.0.18'

source:
- path: bin
Expand All @@ -21,8 +21,8 @@ outputs:
host:
- python
run:
- microsoft::playwright > 1.49.1
- pyjs_code_runner >= 3.0.0
- playwright
- pyjs_code_runner >=3.0.0

- package:
name: pytester-run
Expand Down
13 changes: 3 additions & 10 deletions test_recipes/only_py_tests/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
context:
name: only_py_tests
version: "1.0.0"
version: "2.0.0"

package:
name: ${{ name|lower }}
version: ${{ version }}


build:
number: 1
number: 0

requirements:
run:
- numpy<2
- numpy
- python
- pandas
- arrow-python
- matplotlib
- pandas
- matplotlib
- scipy
- ipython
- arrow-python

tests:
- script: pytester
Expand Down
30 changes: 17 additions & 13 deletions test_recipes/only_py_tests/test_it.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
def test_imports():
import matplotlib.pyplot as plt
# def test_imports():
# import matplotlib.pyplot as plt

import pandas
from pandas import read_csv, DataFrame
# import pandas
# from pandas import read_csv, DataFrame

import pyarrow as pa
# import pyarrow as pa

import pkgutil
import scipy.interpolate
import scipy
# import pkgutil
# import scipy.interpolate
# import scipy

for submodule in pkgutil.iter_modules(scipy.__path__):
__import__(f"scipy.{submodule.name}")
# for submodule in pkgutil.iter_modules(scipy.__path__):
# __import__(f"scipy.{submodule.name}")

import IPython
from IPython.core.displayhook import DisplayHook
from IPython.core.displaypub import DisplayPublisher
# import IPython
# from IPython.core.displayhook import DisplayHook
# from IPython.core.displaypub import DisplayPublisher


def test_import():
import numpy as np
Loading