mumuki-python-runner 1.8.0 → 1.9.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f4a1cf971f4ce948e0e251e05f92672ca1c01e2b7f4441b60f57634c8cd89c68
4
- data.tar.gz: 6bf96e4e38f596547ed4258c8447e8f6be826a8afedb75989fef278ea70a1664
3
+ metadata.gz: c4d71782cc6a4bb668ebd27663806c9e71b4286064d2b4229cd1b506fc940298
4
+ data.tar.gz: 65489c77da9b7792c91b03675cc64c357667fa0c2fd875e5a271d46b5be798e3
5
5
  SHA512:
6
- metadata.gz: f6340927de462b077cda6f61ea5dfb8b3bdc7ff1419abd8d59f623c33cac2f7c40eba7770a92b5a20c560b2e1e7b98d1343f668f93d9e6441e7c4d63c2b5669d
7
- data.tar.gz: e5858f8ff89f2a13e1a1f65e265f4467a1e4017ed2c42bbbd92986e22436d54c46994c79e684384e1288a44ec3bb3dc492aaf305ab65adad08fc8223ceb5284b
6
+ metadata.gz: 31edbca36fcfd89180a4228c3e3c5f8bf715ede959697d906b25c8391efabec4c609dd3264bf2c38213fca1e0770d187256cf527cf992b0ef586af0bba03dfbe
7
+ data.tar.gz: ae718c4c3119f79d96f00480418e9d2d1eaf2ae42bc2f9083de2a602719a6c9b30a4c00da8aeaf2c600e86db3f68f7bb4db54ca74dc21aef4ae00e138e3c43ef
@@ -16,8 +16,13 @@ class Test(unittest.TestCase):
16
16
  def test_description_example(self):
17
17
  self.assertTrue(True)
18
18
  python
19
- }}
19
+ },
20
+ libraries: libraries,
21
+ }.compact
20
22
  end
21
23
 
22
24
  required :version
25
+
26
+ def libraries
27
+ end
23
28
  end
data/lib/base/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
 
2
2
  module BasePythonVersionHook
3
- VERSION = '1.8.0'
3
+ VERSION = '1.9.0'
4
4
  end
@@ -3,7 +3,7 @@ require_relative './base'
3
3
  def reload_python2_runner!
4
4
  Mumukit.runner_name = 'python'
5
5
  Mumukit.configure do |config|
6
- config.docker_image = 'mumuki/mumuki-python2-worker:0.1'
6
+ config.docker_image = 'mumuki/mumuki-python2-worker:0.2'
7
7
  # comment type should be Mumukit::Directives::CommentType::Ruby, but it is
8
8
  # Mumukit::Directives::CommentType::Cpp for backward compatibility
9
9
  config.stateful = true
@@ -2,5 +2,8 @@ class Python3MetadataHook < BasePythonMetadataHook
2
2
  def version
3
3
  '3.7.3'
4
4
  end
5
- end
6
5
 
6
+ def libraries
7
+ {pandas: '1.3.3'}
8
+ end
9
+ end
@@ -1,6 +1,5 @@
1
1
  class Python3TryHook < Mumukit::Templates::TryHook
2
2
  isolated true
3
- attr_reader :query_hook
4
3
 
5
4
  def initialize(config = nil)
6
5
  super config
@@ -9,16 +8,20 @@ class Python3TryHook < Mumukit::Templates::TryHook
9
8
 
10
9
  def compile_file_content(r)
11
10
  <<python
12
- #{query_hook.compile_file_header(r)}
11
+ #{@query_hook.compile_file_header(r)}
13
12
  print("#{query_separator}");
14
- #{query_hook.compile_query(r.query, '')}
13
+ #{@query_hook.compile_query(r.query, '')}
15
14
  print("#{goal_separator}");
16
- #{query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
15
+ #{@query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
17
16
  python
18
17
  end
19
18
 
20
- delegate :tempfile_extension, to: :query_hook
21
- delegate :command_line, to: :query_hook
19
+ delegate :tempfile_extension, to: :@query_hook
20
+ delegate :command_line, to: :@query_hook
21
+
22
+ def post_process_file(file, result, status)
23
+ super file, *@query_hook.post_process_file(file, result, status)
24
+ end
22
25
 
23
26
  def query_separator
24
27
  '!!!MUMUKI-QUERY-START!!!'
@@ -29,15 +32,14 @@ python
29
32
  end
30
33
 
31
34
  def to_structured_results(_file, result, status)
32
- /#{query_separator}
33
- ?(.*)
34
- #{goal_separator}
35
- ?(.*)
36
- /m =~ result
35
+ result_match = result[/#{query_separator}
36
+ \K.*?(?=(#{goal_separator})|\z)/m]&.rstrip
37
+ goal_match = result[/#{goal_separator}
38
+ \K.*\z/m]&.rstrip
37
39
 
38
40
  {
39
- query: to_query_result($1, status),
40
- goal: $2,
41
+ query: to_query_result(result_match, status),
42
+ goal: goal_match,
41
43
  status: status
42
44
  }
43
45
  end
@@ -3,7 +3,7 @@ require_relative './base'
3
3
  def reload_python3_runner!
4
4
  Mumukit.runner_name = 'python3'
5
5
  Mumukit.configure do |config|
6
- config.docker_image = 'mumuki/mumuki-python3-worker:0.1'
6
+ config.docker_image = 'mumuki/mumuki-python3-worker:0.3'
7
7
  config.comment_type = Mumukit::Directives::CommentType::Ruby
8
8
  config.structured = true
9
9
  config.stateful = true
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mumuki-python-runner
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.0
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Franco Leonardo Bulgarelli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-06 00:00:00.000000000 Z
11
+ date: 2022-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mumukit
@@ -24,6 +24,26 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '2.41'
27
+ - !ruby/object:Gem::Dependency
28
+ name: mulang
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '6.0'
34
+ - - ">="
35
+ - !ruby/object:Gem::Version
36
+ version: 6.0.8
37
+ type: :runtime
38
+ prerelease: false
39
+ version_requirements: !ruby/object:Gem::Requirement
40
+ requirements:
41
+ - - "~>"
42
+ - !ruby/object:Gem::Version
43
+ version: '6.0'
44
+ - - ">="
45
+ - !ruby/object:Gem::Version
46
+ version: 6.0.8
27
47
  - !ruby/object:Gem::Dependency
28
48
  name: bundler
29
49
  requirement: !ruby/object:Gem::Requirement