diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1807f31..9b66530 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index cbf23b6..5a39950 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ) diff --git a/build_mkdocs.sh b/build_mkdocs.sh index bb454ec..98270df 100755 --- a/build_mkdocs.sh +++ b/build_mkdocs.sh @@ -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" diff --git a/src/inflate.cpp b/src/inflate.cpp index f8041bb..c154c26 100644 --- a/src/inflate.cpp +++ b/src/inflate.cpp @@ -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 #include diff --git a/tests/tests/test_pyjs.py b/tests/tests/test_pyjs.py index e244947..289338b 100644 --- a/tests/tests/test_pyjs.py +++ b/tests/tests/test_pyjs.py @@ -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