Merge pull request #50 from JohanMabille/revert_release

Reverts broken release
jupyter-xeus · Apr 29, 2024 · 0fc8e26 · 0fc8e26
2 parents bf74795 + 2621bb0
commit 0fc8e26
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,6 +21,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         luajit: [ON, OFF]
+        exclude:
+          - os: macos-latest
+            luajit: ON
 
     steps:
       - uses: actions/checkout@v4

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -7,7 +7,7 @@ dependencies:
   - cxx-compiler
   # Host dependencies
   - xeus-zmq>=1.3.0, <2.0
-  - nlohmann_json
+  - nlohmann_json=3.11.2
   - cppzmq
   - xtl>=0.7
   - lua>=5.2.0

diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml
@@ -5,7 +5,7 @@ channels:
 dependencies:
   - lua
   - nlohmann_json
-  - xeus-lite
+  - xeus-lite <2.0
   - xeus >=3.2.0,<4.0
   - xtl >=0.7,<0.8
   - xcanvas >=0.4,<5.0

diff --git a/include/xeus-lua/xeus_lua_config.hpp b/include/xeus-lua/xeus_lua_config.hpp
@@ -13,7 +13,7 @@
 // Project version
 #define XEUS_LUA_VERSION_MAJOR 0
 #define XEUS_LUA_VERSION_MINOR 7
-#define XEUS_LUA_VERSION_PATCH 5
+#define XEUS_LUA_VERSION_PATCH 4
 
 // Composing the version string from major, minor and patch
 #define XEUS_LUA_CONCATENATE(A, B) XEUS_LUA_CONCATENATE_IMPL(A, B)