[magics] 01/04: cosmetic

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Apr 25 10:44:39 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/2.32.0-2
in repository magics.

commit 70aa3865d8bbc07a8cd2c07c5c4c5df7005fe674
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Apr 25 09:01:46 2017 +0100

    cosmetic
---
 debian/patches/python3.patch | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 3e1ed95..9ed7d95 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1864,6 +1864,15 @@ Index: magics++-2.32.0/python/Magics/toolbox.py
  
      return out
  
+@@ -409,7 +407,7 @@ def epsgraph(parameter, input, **args):
+    
+     if "climate" in args  : 
+     	
+-    	clim = macro.mwrepjson(
++        clim = macro.mwrepjson(
+                             wrepjson_family =  "eps",
+                             wrepjson_keyword =  "clim",
+                             wrepjson_input_filename = input,
 @@ -426,9 +424,7 @@ def epsgraph(parameter, input, **args):
          actions.append(shade)
      
@@ -1875,6 +1884,32 @@ Index: magics++-2.32.0/python/Magics/toolbox.py
      text = macro.mtext(
                      text_colour =  "navy",
                      text_font_size = font_size*2,
+@@ -445,16 +441,15 @@ def epsgraph(parameter, input, **args):
+     
+     if "output" in args != "" :
+     	#Setting of the output file name
+-		png = macro.output(output_formats = ['png'], 
+-			output_name_first_page_number = "off",
+-			output_name = args["output"], 
+-      super_page_y_length = 10.,
+-      subpage_y_length = 5.,
+-      subpage_y_position = 1.,
+-      )
+-
+-		return macro._plot(
+-			png,
++        png = macro.output(output_formats = ['png'], 
++			   output_name_first_page_number = "off",
++			   output_name = args["output"], 
++      	                   super_page_y_length = 10.,
++                           subpage_y_length = 5.,
++                           subpage_y_position = 1.,
++        )        
++        return macro._plot(
++	    png,
+             actions
+     	)	
+ 
 Index: magics++-2.32.0/utils/epsgrams.py
 ===================================================================
 --- magics++-2.32.0.orig/utils/epsgrams.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git



More information about the debian-science-commits mailing list