mumuki-python-runner 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a1cf971f4ce948e0e251e05f92672ca1c01e2b7f4441b60f57634c8cd89c68
-  data.tar.gz: 6bf96e4e38f596547ed4258c8447e8f6be826a8afedb75989fef278ea70a1664
+  metadata.gz: c4d71782cc6a4bb668ebd27663806c9e71b4286064d2b4229cd1b506fc940298
+  data.tar.gz: 65489c77da9b7792c91b03675cc64c357667fa0c2fd875e5a271d46b5be798e3
 SHA512:
-  metadata.gz: f6340927de462b077cda6f61ea5dfb8b3bdc7ff1419abd8d59f623c33cac2f7c40eba7770a92b5a20c560b2e1e7b98d1343f668f93d9e6441e7c4d63c2b5669d
-  data.tar.gz: e5858f8ff89f2a13e1a1f65e265f4467a1e4017ed2c42bbbd92986e22436d54c46994c79e684384e1288a44ec3bb3dc492aaf305ab65adad08fc8223ceb5284b
+  metadata.gz: 31edbca36fcfd89180a4228c3e3c5f8bf715ede959697d906b25c8391efabec4c609dd3264bf2c38213fca1e0770d187256cf527cf992b0ef586af0bba03dfbe
+  data.tar.gz: ae718c4c3119f79d96f00480418e9d2d1eaf2ae42bc2f9083de2a602719a6c9b30a4c00da8aeaf2c600e86db3f68f7bb4db54ca74dc21aef4ae00e138e3c43ef

data/lib/base/metadata_hook.rb

@@ -16,8 +16,13 @@ class Test(unittest.TestCase):
   def test_description_example(self):
     self.assertTrue(True)
 python
-     }}
+     },
+     libraries: libraries,
+    }.compact
   end
 
   required :version
+
+  def libraries
+  end
 end

data/lib/base/version.rb

@@ -1,4 +1,4 @@
 
 module BasePythonVersionHook
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

data/lib/python2_runner.rb

@@ -3,7 +3,7 @@ require_relative './base'
 def reload_python2_runner!
   Mumukit.runner_name = 'python'
   Mumukit.configure do |config|
-    config.docker_image = 'mumuki/mumuki-python2-worker:0.1'
+    config.docker_image = 'mumuki/mumuki-python2-worker:0.2'
     # comment type should be Mumukit::Directives::CommentType::Ruby, but it is
     # Mumukit::Directives::CommentType::Cpp for backward compatibility
     config.stateful = true

data/lib/python3/metadata_hook.rb

@@ -2,5 +2,8 @@ class Python3MetadataHook < BasePythonMetadataHook
   def version
     '3.7.3'
   end
-end
 
+  def libraries
+    {pandas: '1.3.3'}
+  end
+end

data/lib/python3/try_hook.rb

@@ -1,6 +1,5 @@
 class Python3TryHook < Mumukit::Templates::TryHook
   isolated true
-  attr_reader :query_hook
 
   def initialize(config = nil)
     super config
@@ -9,16 +8,20 @@ class Python3TryHook < Mumukit::Templates::TryHook
 
   def compile_file_content(r)
     <<python
-#{query_hook.compile_file_header(r)}
+#{@query_hook.compile_file_header(r)}
 print("#{query_separator}");
-#{query_hook.compile_query(r.query, '')}
+#{@query_hook.compile_query(r.query, '')}
 print("#{goal_separator}");
-#{query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
+#{@query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
 python
   end
 
-  delegate :tempfile_extension, to: :query_hook
-  delegate :command_line, to: :query_hook
+  delegate :tempfile_extension, to: :@query_hook
+  delegate :command_line, to: :@query_hook
+
+  def post_process_file(file, result, status)
+    super file, *@query_hook.post_process_file(file, result, status)
+  end
 
   def query_separator
     '!!!MUMUKI-QUERY-START!!!'
@@ -29,15 +32,14 @@ python
   end
 
   def to_structured_results(_file, result, status)
-    /#{query_separator}
-?(.*)
-#{goal_separator}
-?(.*)
-/m =~ result
+    result_match = result[/#{query_separator}
+\K.*?(?=(#{goal_separator})|\z)/m]&.rstrip
+    goal_match = result[/#{goal_separator}
+\K.*\z/m]&.rstrip
 
     {
-        query: to_query_result($1, status),
-        goal: $2,
+        query: to_query_result(result_match, status),
+        goal: goal_match,
         status: status
     }
   end

data/lib/python3_runner.rb

@@ -3,7 +3,7 @@ require_relative './base'
 def reload_python3_runner!
   Mumukit.runner_name = 'python3'
   Mumukit.configure do |config|
-    config.docker_image = 'mumuki/mumuki-python3-worker:0.1'
+    config.docker_image = 'mumuki/mumuki-python3-worker:0.3'
     config.comment_type = Mumukit::Directives::CommentType::Ruby
     config.structured = true
     config.stateful = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.41'
+- !ruby/object:Gem::Dependency
+  name: mulang
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement