Commit f9445cf8 authored by Anton Gladky's avatar Anton Gladky

Remove uneeded patches

parent cd3a82dc
From: Anton Gladky <gladk@debian.org>
Date: Sat, 25 Feb 2017 22:30:24 +0100
Subject: [PATCH] Initialize gui in IPython 5.
---
core/main/main.py.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: trunk-master/core/main/main.py.in
===================================================================
--- trunk-master.orig/core/main/main.py.in
+++ trunk-master/core/main/main.py.in
@@ -222,6 +222,9 @@ def userSession(gui='none',qapp=None):
for k in ipconfig: setattr(InteractiveShellEmbed,k,ipconfig[k])
InteractiveShellEmbed.banner1=banner+'\n' # called banner1 here, not banner anymore
ipshell=InteractiveShellEmbed()
+ # If IPython > 5 one need to initialize graphic gui
+ if ((gui == "qt5" or gui == "qt4")and yade.runtime.ipython_version>=500):
+ ipshell.enable_gui(gui)
ipshell()
elif yade.runtime.ipython_version>=12:
if yade.runtime.ipython_version>=100:
Description: Use tar.gz instead of bz2
Author: Anton Gladky <gladk@debian.org>
Bug-Debian: https://bugs.debian.org/
Bug: https://bugs.launchpad.net/yade/+bug/1774065
Last-Update: 2018-06-08
--- yade-2018.02b.orig/py/plot.py
+++ yade-2018.02b/py/plot.py
@@ -621,9 +621,9 @@ def saveDataTxt(fileName,vars=None):
>>> plot.addData(a=2,b=12,c=22,d=32)
>>> pprint(plot.data)
{'a': [1, 2], 'b': [11, 12], 'c': [21, 22], 'd': [31, 32]}
- >>> plot.saveDataTxt('/tmp/dataFile.txt.bz2',vars=('a','b','c'))
+ >>> plot.saveDataTxt('/tmp/dataFile.txt.tar.gz',vars=('a','b','c'))
>>> import numpy
- >>> d=numpy.genfromtxt('/tmp/dataFile.txt.bz2',dtype=None,names=True)
+ >>> d=numpy.genfromtxt('/tmp/dataFile.txt.tar.gz',dtype=None,names=True)
>>> d['a']
array([1, 2])
>>> d['b']
Description: Fix sphinx-doc compilation with a newer sphinx
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2018-06-09
--- yade-2018.02b.orig/doc/sphinx/conf.py
+++ yade-2018.02b/doc/sphinx/conf.py
@@ -172,6 +172,7 @@ def fixSrc(app,docname,source):
source[0]=replaceLaTeX(source[0])
def fixDocstring(app,what,name,obj,options,lines):
+ for i in range(0,len(lines)): lines[i]=lines[i].decode('utf-8')
# remove empty default roles, which is not properly interpreted by docutils parser
for i in range(0,len(lines)):
lines[i]=lines[i].replace(':ydefault:``','')
@@ -187,8 +188,9 @@ def fixDocstring(app,what,name,obj,optio
lines[i]=l2[i] if i<len(l2) else ''
elif isBoostMethod(what,obj):
l2=boostFuncSignature(name,obj)[1]
- for i in range(0,len(lines)):
- lines[i]=l2[i] if i<len(l2) else ''
+ if (l2):
+ for i in range(0,len(lines)):
+ lines[i]=l2[i] if i<len(l2) else ''
# LaTeX: replace $...$ by :math:`...`
# must be done after calling boostFuncSignature which uses original docstring
for i in range(0,len(lines)): lines[i]=replaceLaTeX(lines[i])
--- yade-2018.02b.orig/doc/sphinx/formulation.rst
+++ yade-2018.02b/doc/sphinx/formulation.rst
@@ -452,7 +452,7 @@ Updating particle orientation $\curr{q}$
.. math:: \curraaccel_i&=\vec{T}_i/\vec{I}_{11},
-We use the same approximation scheme, obtaining an equation analogous to :eq:`eq-leapfrog-nnextvel`
+We use the same approximation scheme, obtaining an equation analogous to :eq:`eq-leapfrog-nextvel`
.. math:: \nnextangvel&=\pprevangvel+\Dt\curraaccel.
--- yade-2018.02b.orig/doc/sphinx/yadeSphinx.py
+++ yade-2018.02b/doc/sphinx/yadeSphinx.py
@@ -4,6 +4,8 @@
# module documentation
#
import sys,os,os.path
+reload(sys)
+sys.setdefaultencoding('utf8')
outDir=sys.argv[2] if len(sys.argv)>2 else '_build'
for d in (outDir,outDir+'/latex',outDir+'/html'):
--- yade-2018.02b.orig/doc/sphinx/ipython_directive012.py
+++ yade-2018.02b/doc/sphinx/ipython_directive012.py
@@ -75,7 +75,11 @@ import matplotlib
import sphinx
from docutils.parsers.rst import directives
from docutils import nodes
-from sphinx.util.compat import Directive
+try:
+ from sphinx.util.compat import Directive
+except ImportError:
+ from docutils.parsers.rst import Directive
+
matplotlib.use('Agg')
--- yade-2018.02b.orig/doc/sphinx/ipython_directive013.py
+++ yade-2018.02b/doc/sphinx/ipython_directive013.py
@@ -76,7 +76,10 @@ import matplotlib
import sphinx
from docutils.parsers.rst import directives
from docutils import nodes
-from sphinx.util.compat import Directive
+try:
+ from sphinx.util.compat import Directive
+except ImportError:
+ from docutils.parsers.rst import Directive
matplotlib.use('Agg')
--- yade-2018.02b.orig/doc/sphinx/ipython_directive200.py
+++ yade-2018.02b/doc/sphinx/ipython_directive200.py
@@ -143,7 +143,10 @@ except ImportError:
import sphinx
from docutils.parsers.rst import directives
from docutils import nodes
-from sphinx.util.compat import Directive
+try:
+ from sphinx.util.compat import Directive
+except ImportError:
+ from docutils.parsers.rst import Directive
# Our own
from IPython import Config, InteractiveShell
--- yade-2018.02b.orig/doc/sphinx/ipython_directive500.py
+++ yade-2018.02b/doc/sphinx/ipython_directive500.py
@@ -138,7 +138,10 @@ import shutil
# Third-party
from docutils.parsers.rst import directives
-from sphinx.util.compat import Directive
+try:
+ from sphinx.util.compat import Directive
+except ImportError:
+ from docutils.parsers.rst import Directive
# Our own
from traitlets.config import Config
From f5aa5f725b8993eab8a41c6e9ac10af960ac435f Mon Sep 17 00:00:00 2001
From: Janek Kozicki <janek_listy@wp.pl>
Date: Fri, 4 Jan 2019 19:04:45 +0100
Subject: [PATCH] Initial idea for fixing CGAL 4.13 interface changes.
---
lib/triangulation/Tesselation.ipp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: yade/lib/triangulation/Tesselation.ipp
===================================================================
--- yade.orig/lib/triangulation/Tesselation.ipp
+++ yade/lib/triangulation/Tesselation.ipp
@@ -75,7 +75,8 @@ typename _Tesselation<TT>::VertexHandle
{
bool fictious = vertexHandles[id]->info().isFictious;
VertexHandle Vh;
- Vh = Tri->move_point ( vertexHandles[id], Sphere ( Point ( x,y,z ),pow ( rad,2 ) ) );
+#warning "It was move_point before CGAL 4.13, does it pass all the tests now?"
+ Vh = Tri->move ( vertexHandles[id], Sphere ( Point ( x,y,z ),pow ( rad,2 ) ) );
if ( Vh!=NULL )
{
vertexHandles[id] = Vh;
01_remove_google_analytics.patch
08_fix_gui.patch
10_fix_bz2_pyhon2_problem.patch
12_fix_doc_generation.patch
15_fix_cgal_compilation.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment