Commit d4a621c5 authored by Maxime Perrotin's avatar Maxime Perrotin

Port to Python3

parent 28e95302
all: install
install:
@pip2 install --user --upgrade .
@pip3 install --user --upgrade .
clean:
make -C test -f Makefile.properties clean || :
......
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding:Utf-8 -*-
''' Custom logging color formatter
......
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
......@@ -7,5 +7,5 @@
for use in a model checker or simulator.
"""
import properties
from . import properties
__version__ = properties.__version__
This diff is collapsed.
#!/usr/bin/python
#!/usr/bin/python3
''' Property parser for SDL systems
......@@ -9,14 +9,14 @@ and generate code to verify the property
This shall be used in combination with the OpenGEODE simulator
(c) European Space Agency, 2015-2016
(c) European Space Agency, 2015-2019
Author: Maxime.Perrotin@esa.int
'''
__author__ = "Maxime Perrotin"
__license__ = "LGPL v3"
__version__ = "1.1.4"
__version__ = "3.0.0"
__url__ = "http://taste.tuxfamily.org"
import os
......@@ -28,10 +28,10 @@ import re
import logging
import argparse
from ColorFormatter import ColorFormatter
from .ColorFormatter import ColorFormatter
import opengeode
import checker
from . import checker
# Set up the logging facilities
log = logging.getLogger(__name__)
......@@ -149,7 +149,9 @@ def cli():
version = 'Taste Properties version {}'.format(__version__)
# Parse the command line
parser = argparse.ArgumentParser(version=version)
parser = argparse.ArgumentParser()
parser.add_argument('-v', '--version', action='version',
version=__version__)
parser.add_argument('-g', '--verbose', action='store_true', default=False,
help='Display debug information')
parser.add_argument('-d', '--no_dll', action='store_true', default=False,
......
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
'''
Setup file for Linux distribution
......@@ -25,7 +25,7 @@ setup(
'Programming Language :: Python',
'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7'
'Programming Language :: Python :: 3.7'
],
entry_points={
'console_scripts': [
......
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