Commit 3b816973 authored by Yori Fournier's avatar Yori Fournier
Browse files

Merge branch 'begin-tuto' into 'master'

Now compatible with python3

See merge request !8
parents e2fae58b f250a8d0
......@@ -26,15 +26,15 @@ you can rename `mypltemplate` to any name you whish.
in `/home/user/src/mymodule`:
```
git git@gitlab.aip.de:yfournier/myplotlib.git --branch tools
git git@gitlab.aip.de:yfournier/myplotlib.git --branch v2.2.1a
```
## STEP 3: download source **(without an account at gitlab.aip.de)**
download source of the module myplotlib
- [zip](https://gitlab.aip.de/yfournier/myplotlib/repository/archive.zip?ref=tools)
- [tar.gz](https://gitlab.aip.de/yfournier/myplotlib/repository/archive.tar.gz?ref=tools)
- [zip](https://gitlab.aip.de/yfournier/myplotlib/repository/archive.zip?ref=v2.2.1a)
- [tar.gz](https://gitlab.aip.de/yfournier/myplotlib/repository/archive.tar.gz?ref=v2.2.1a)
extract and rename like `/home/user/src/mymodule/myplotlib`
......
......@@ -12,20 +12,20 @@ SPCE = ' > -----: '
DEBUG = False
# IMPORT myplotlib MyWin
from myplotlib import MyWin, MyData
from .myplotlib import MyWin, MyData
# IMPORT myplotlib MYTOOL toolbox
from myplotlib.mytool import *
from .myplotlib.mytool import *
# IMPORT myplotlib DESIGN module
from myplotlib.design import *
from .myplotlib.design import *
# IMPORT USER'S IOs
from myIOs import readRun
from myIOs import readSerie
from .myIOs import readRun
from .myIOs import readSerie
# IMPORT USER'S Axes
from myAxes import *
from .myAxes import *
# IMPORT USER'S Figures
from myFigures import *
from .myFigures import *
from . import INFO, SPCE, WARN, SEVR, DBUG
from . import __dict__
from .test import myTest, G_TESTS_LIST
# Local required import ------------------------------------------------
......@@ -7,6 +7,7 @@ import sys
import os
import getopt
# Usage ---------------------------------------------------
usage = '''
{0}Usage: python mfdPlot [-h]
......@@ -45,8 +46,14 @@ for opt, arg in opts:
elif opt in ("--test",):
run4test = True
tests = str(arg)
tests = arg[1:-1].split(',')
print(INFO + "List of tests to execute: " + str(tests))
tests2execute = []
for test in G_TESTS_LIST:
if test.__name__ in tests:
tests2execute.append(test)
elif opt in ("-s", "--script"):
run4script = True
script2execute = str(arg)
......@@ -65,8 +72,7 @@ if(run4test):
for test in tests2execute:
print
print
print('\n')
print(INFO + '{title:{c}^{n}}'.format(title=' ' + str(test.__name__) + ' ', c='=', n=72))
testStatus = myTest(test, True, fail, debug)
......@@ -79,8 +85,7 @@ if(run4test):
status = status and testStatus
# Print final status
print
print
print('\n')
print(INFO + 'Status of test series: ' + str(status))
if not status:
print(SPCE + 'Number of Failed Tests: ' + str(len(fail)))
......
from axMaxResults import AxMaxResults
from axParameterSpace import AxParameterSpace
from axResults import AxResults
from .axMaxResults import AxMaxResults
from .axParameterSpace import AxParameterSpace
from .axResults import AxResults
from readRun import readRun
from readSerie import readSerie
from .readRun import readRun
from .readSerie import readSerie
from tests import myTest
from tests import test100, test101, test102
from .tests import myTest
from .tests import test100, test101, test102
G_TESTS_LIST = [test100, test101, test102]
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