<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4d8441568be683a47d6e4bb99a9404ebf29d3733">https://github.com/macports/macports-ports/commit/4d8441568be683a47d6e4bb99a9404ebf29d3733</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4d8441568be xeus-sqlite: update to 0.7.0; update python variants
</span>4d8441568be is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d8441568be683a47d6e4bb99a9404ebf29d3733
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Tue Dec 17 07:35:13 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> xeus-sqlite: update to 0.7.0; update python variants
</span>---
databases/xeus-sqlite/Portfile | 28 +++++-----
databases/xeus-sqlite/files/143.diff | 102 -----------------------------------
2 files changed, 12 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xeus-sqlite/Portfile b/databases/xeus-sqlite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7cb7053f22..87922ad2acd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xeus-sqlite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/xeus-sqlite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup jupyter-xeus xeus-sqlite 0.6.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jupyter-xeus xeus-sqlite 0.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories databases
license BSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,26 +13,25 @@ description xeus-sqlite is a Jupyter kernel for SQL based on the nat
</span> implementation of the Jupyter protocol xeus.
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 14000e84be51666bbe40efeeac7cf4209ae242cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2d126fbef4e32b42fb7ecc8b309491e4a7d2ea66c703402ebf3711a88ffa3c3b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 373461
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ca4ee09efed7492d8a9e720a071ab86322f0fade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50f8aeac6a974c3eff7c732b5b2ac32186337cc82cb463ed9d90783a3f63b4ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 373506
</span>
compiler.cxx_standard 2017
depends_build-append path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 python311 python312 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 python310 python311 python312 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python38 python39 python311 python312 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python311 conflicts python38 python39 python310 python312 description {Use Python 3.11} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python312 conflicts python38 python39 python310 python311 description {Use Python 3.12} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python310 python311 python312 python313 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python39 python311 python312 python313 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python39 python310 python312 python313 description {Use Python 3.11} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python312 conflicts python39 python310 python311 python313 description {Use Python 3.12} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python313 conflicts python39 python310 python311 python312 description {Use Python 3.13} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && ![variant_isset python39]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311] && ![variant_isset python313]} {
</span> default_variants +python312
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach pv {312 311 310 39 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv {313 312 311 310 39} {
</span> if {[variant_isset python${pv}]} {
set python.version ${pv}
break
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +53,6 @@ if {${configure.build_arch} ni [list ppc ppc64]} {
</span> depends_lib-append port:py${python.version}-jupyterlab
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# xeus-sqlite PR that fixes https://github.com/jupyter-xeus/xeus-sqlite/issues/141
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 143.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append -DCMAKE_PREFIX_PATH:PATH=${prefix}/lib/pkgconfig \
-Dcppzmq_DIR=${prefix}/share/cmake/cppzmq \
-Dnlohmann_json_DIR=${prefix}/share/cmake/nlohmann_json \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/xeus-sqlite/files/143.diff b/databases/xeus-sqlite/files/143.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1086347fe52..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/xeus-sqlite/files/143.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,102 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git environment-dev.yml environment-dev.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4708311..fa87ef0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- environment-dev.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ environment-dev.yml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,15 +7,15 @@ dependencies:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - cxx-compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Host dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - nlohmann_json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - xtl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - cppzmq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - xeus-zmq=1.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - xeus>=5.0.0,<=6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - xeus-zmq>=3.0.0,<=4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - sqlitecpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - cpp-tabulate=1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - xvega=0.0.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - xproperty=0.11.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - xvega-bindings=0.0.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - xvega>=0.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - xproperty>=0.12.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - xvega-bindings>=0.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - pytest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - jupyter_kernel_test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git include/xeus-sqlite/xeus_sqlite_interpreter.hpp include/xeus-sqlite/xeus_sqlite_interpreter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 91eb437..78654de 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/xeus-sqlite/xeus_sqlite_interpreter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/xeus-sqlite/xeus_sqlite_interpreter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,12 +39,11 @@ namespace xeus_sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string m_db_path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void configure_impl() override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nl::json execute_request_impl(int execution_counter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool silent,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool store_history,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nl::json user_expressions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool allow_stdin) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void execute_request_impl(send_reply_callback cb,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int execution_counter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xeus::execute_request_config config,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nl::json user_expressions) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nl::json complete_request_impl(const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int cursor_pos) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nl::json inspect_request_impl(const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/main.cpp src/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c11af2d..4f8a1de 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xeus/xkernel.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xeus/xkernel_configuration.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "xeus-zmq/xserver_shell_main.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "xeus-zmq/xserver_zmq_split.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "xeus-zmq/xzmq_context.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xeus-sqlite/xeus_sqlite_interpreter.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xeus-sqlite/xeus_sqlite_config.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +99,7 @@ int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Load configuration file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string file_name = extract_filename(argc, argv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto context = xeus::make_context<zmq::context_t>();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Create interpreter instance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using interpreter_ptr = std::unique_ptr<xeus_sqlite::interpreter>;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/xeus_sqlite_interpreter.cpp src/xeus_sqlite_interpreter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a1280f6..5619b46 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/xeus_sqlite_interpreter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/xeus_sqlite_interpreter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -368,12 +368,11 @@ namespace xeus_sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nl::json interpreter::execute_request_impl(int execution_counter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool /*silent*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool /*store_history*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nl::json /*user_expressions*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool /*allow_stdin*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void interpreter::execute_request_impl(send_reply_callback cb,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int execution_counter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xeus::execute_request_config /*config*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nl::json /*user_expressions*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<std::string> traceback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nl::json jresult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,7 +445,7 @@ namespace xeus_sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- publish_execution_error(jresult["ename"], jresult["evalue"], traceback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- traceback.clear();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return jresult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cb(jresult);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nl::json interpreter::complete_request_impl(const std::string& raw_code,
</span></pre><pre style='margin:0'>
</pre>