Skip to content
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
7 changes: 6 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ jobs:
-c https://repo.mamba.pm/emscripten-forge \
-c https://repo.mamba.pm/conda-forge \
--yes \
python=${{matrix.python_version}} "pybind11${{matrix.pybind11_version}}" nlohmann_json pybind11_json "numpy<2" "pytest==7.1.1" bzip2 sqlite zlib zstd libffi exceptiongroup emscripten-abi==${{matrix.emsdk_ver}}
python=${{matrix.python_version}} \
"pybind11${{matrix.pybind11_version}}" \
nlohmann_json pybind11_json "numpy<2" \
"pytest==7.1.1" bzip2 sqlite zlib zstd libffi \
exceptiongroup emscripten-abi==${{matrix.emsdk_ver}} \
openssl


mkdir build
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ SET(PYTHON_UTIL_LIBS
${CMAKE_INSTALL_PREFIX}/lib/libsqlite3.a
${CMAKE_INSTALL_PREFIX}/lib/libffi.a
${CMAKE_INSTALL_PREFIX}/lib/libzstd.a
# ssl
${CMAKE_INSTALL_PREFIX}/lib/libssl.a
# crypto
${CMAKE_INSTALL_PREFIX}/lib/libcrypto.a
)


Expand Down
2 changes: 1 addition & 1 deletion build_mkdocs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ ! -d "$WASM_ENV_PREFIX" ]; then
--yes \
python=$PYTHON_VERSION "pybind11" nlohmann_json pybind11_json numpy \
bzip2 sqlite zlib zstd libffi exceptiongroup\
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2"
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" openssl

else
echo "Wasm env $WASM_ENV_NAME already exists"
Expand Down
1 change: 0 additions & 1 deletion src/inflate.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// from https://zlib.net/zlib_how.html
// and https://windrealm.org/tutorials/decompress-gzip-stream.php
// and https://stackoverflow.com/questions/10195343/copy-a-file-in-a-sane-safe-and-efficient-way
#pragma once

#include <stdio.h>
#include <string.h>
Expand Down
6 changes: 5 additions & 1 deletion tests/tests/test_pyjs.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

import pyjs


# check python version
if sys.version_info[0] == 3 and sys.version_info[1] >= 13:
def test_ssl_import():
import ssl

def test_js_submodule():
from pyjs.js import Function

Expand Down
Loading