Commit d2dfaeec authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Merged master in feature_buster.

parents cbee6fed 6363b21f
PY_SRC:=$(wildcard dmt/asn2dataModel.py dmt/aadl2glueC.py dmt/smp2asn.py dmt/*mappers/[a-zA-Z]*py dmt/commonPy/[a-zA-Z]*py) PY_SRC:=$(wildcard dmt/asn2dataModel.py dmt/aadl2glueC.py dmt/smp2asn.py dmt/*mappers/[a-zA-Z]*py dmt/commonPy/[a-zA-Z]*py)
PY_SRC:=$(filter-out dmt/B_mappers/antlr.main.py dmt/A_mappers/Stubs.py, ${PY_SRC}) PY_SRC:=$(filter-out dmt/B_mappers/antlr.main.py dmt/A_mappers/Stubs.py dmt/B_mappers/micropython_async_B_mapper.py dmt/commonPy/commonSMP2.py, ${PY_SRC})
# Python3.5 includes an older version of typing, which by default has priority over # Python3.5 includes an older version of typing, which by default has priority over
# the one installed in $HOME/.local via setup.py. # the one installed in $HOME/.local via setup.py.
......
...@@ -65,7 +65,7 @@ What is packaged: ...@@ -65,7 +65,7 @@ What is packaged:
Reads the AADL specification of the system, and then generates the runtime Reads the AADL specification of the system, and then generates the runtime
bridge-code that will map the message data structures from those generated bridge-code that will map the message data structures from those generated
by [ASN1SCC](https://github.com/ttsiodras/asn1scc) to/from those generated by [ASN1SCC](https://github.com/ttsiodras/asn1scc) to/from those generated
by the modeling tool (that is used to functionally model the subsystem - by the modeling tool (that is used to functionally model the subsystem;
e.g. SCADE, ObjectGeode, Matlab/Simulink, C, Ada, etc). e.g. SCADE, ObjectGeode, Matlab/Simulink, C, Ada, etc).
Contact Contact
...@@ -79,7 +79,7 @@ contact me at: ...@@ -79,7 +79,7 @@ contact me at:
System, Software and Technology Department System, Software and Technology Department
European Space Agency European Space Agency
ESTEC ESTEC / TEC-SWT
Keplerlaan 1, PO Box 299 Keplerlaan 1, PO Box 299
NL-2200 AG Noordwijk, The Netherlands NL-2200 AG Noordwijk, The Netherlands
Athanasios.Tsiodras@esa.int | www.esa.int Athanasios.Tsiodras@esa.int | www.esa.int
......
...@@ -547,7 +547,7 @@ def DumpTypeDumper( ...@@ -547,7 +547,7 @@ def DumpTypeDumper(
lines.append(codeIndent + "state = self.GetState()") lines.append(codeIndent + "state = self.GetState()")
lines.append(codeIndent + "length = %s.GetLength()" % variableName) lines.append(codeIndent + "length = %s.GetLength()" % variableName)
lines.append(codeIndent + "self.Reset(state)") lines.append(codeIndent + "self.Reset(state)")
lines.append(codeIndent + "map(partial(emitElem, %s), range(length))" % variableName) lines.append(codeIndent + "list(map(partial(emitElem, %s), range(length)))" % variableName)
lines.append(codeIndent + 'self.Reset(state)') lines.append(codeIndent + 'self.Reset(state)')
lines.append(codeIndent + 'lines.append("}")') lines.append(codeIndent + 'lines.append("}")')
......
...@@ -29,7 +29,7 @@ setup( ...@@ -29,7 +29,7 @@ setup(
'coverage>=3.7.1', 'coverage>=3.7.1',
'pytest>=2.6.3', 'pytest>=2.6.3',
'pycodestyle>=2.0.0', 'pycodestyle>=2.0.0',
'typing>=3.5.2.2', 'typing==3.5.2.2',
'mypy-extensions>=0.3.0', 'mypy-extensions>=0.3.0',
], ],
entry_points={ entry_points={
......
.PHONY: M2M M2C clean .PHONY: M2M M2C clean
all: M2M M2C SMP2 all: M2M M2C
M2M: M2M:
$(MAKE) -f Makefile.M2M clean $(MAKE) -f Makefile.M2M clean
......
...@@ -31,7 +31,7 @@ class CompleteTestingOfSQLMapperWithSQLite(AllTests, unittest.TestCase): ...@@ -31,7 +31,7 @@ class CompleteTestingOfSQLMapperWithSQLite(AllTests, unittest.TestCase):
class CompleteTestingOfSQLMapperWithPostgreSQL(AllTests, unittest.TestCase): class CompleteTestingOfSQLMapperWithPostgreSQL(AllTests, unittest.TestCase):
#engine = create_engine('sqlite:///:memory:', echo=True) #engine = create_engine('sqlite:///:memory:', echo=True)
if os.getenv('CIRCLECI') is None: if os.getenv('CIRCLECI') is None:
dburi = 'postgresql+psycopg2://ubuntu:tastedb@localhost/circle_test' dburi = 'postgresql+psycopg2://taste:tastedb@localhost/circle_test'
else: else:
dburi = 'postgresql+psycopg2://ubuntu:@localhost/circle_test' dburi = 'postgresql+psycopg2://ubuntu:@localhost/circle_test'
engine = create_engine(dburi, echo=False) engine = create_engine(dburi, echo=False)
......
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