Commit e91b3014 authored by Yori Fournier's avatar Yori Fournier
Browse files

Merge branch '65-CI-script' into 'dev'

Resolve "TEST: Make the CI script ready for the tests"

Closes #65

See merge request !46
parents 8956bbf9 30445c6f
Pipeline #414 passed with stage
in 1 minute and 32 seconds
myplotlib_server_client: myplotlib_server_client:
script: script:
- apt-get update -q -y - apt-get update -q -y
- apt-get install python-dev -q -y - apt-get install python-dev python-tk -q -y
- wget https://bootstrap.pypa.io/get-pip.py - wget https://bootstrap.pypa.io/get-pip.py
- python get-pip.py - python get-pip.py
- python -m pip --version - python -m pip --version
- python -m pip install --upgrade pip - python -m pip install --upgrade pip
- python -m pip install -U matplotlib - python -m pip install -U matplotlib
- git clone git@gitlab.aip.de:yfournier/myplotlib.git -b 63-cleaning-server-client-renovation myplotlib - git name-rev --name-only HEAD
- cd myplotlib/test/localhost - ls -l
- cd test/localhost
- ./setup_test_folder.sh - ./setup_test_folder.sh
- python import_test.py - python import_test.py
- ./clean_test_folder.sh - ./clean_test_folder.sh
...@@ -62,14 +62,18 @@ from matplotlib.backends.backend_tkagg import FigureManagerTkAgg, FigureCanvasTk ...@@ -62,14 +62,18 @@ from matplotlib.backends.backend_tkagg import FigureManagerTkAgg, FigureCanvasTk
# Test mpl version: # Test mpl version:
from matplotlib import __version__ as mplvers from matplotlib import __version__ as mplvers
print('VERSION of Matplotlib:' + str(mplvers))
if int(mplvers.replace('.','')[:3]) < 150 : if int(mplvers.replace('.','')[:3]) < 150 :
import six import six
from six.moves import tkinter as Tk from six.moves import tkinter as Tk
elif int(mplvers.replace('.','')[:3]) > 200 :
import six
from six.moves import tkinter as Tk
else : else :
from matplotlib.externals import six from matplotlib.externals import six
from matplotlib.externals.six.moves import tkinter as Tk from matplotlib.externals.six.moves import tkinter as Tk
# Class MyWin Overwriting the disgusting Matplotlib.FigureManager class # Class MyWin Overwriting the disgusting Matplotlib.FigureManager class
class MyWin_TkAgg(FigureManagerTkAgg): class MyWin_TkAgg(FigureManagerTkAgg):
......
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