Merge branch 'hotfix-0.1.2'

Author: marcofavorito

pythomata/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """Marco Favorito"""
 __email__ = 'marco.favorito@gmail.com'
-__version__ = '0.1.1'
+__version__ = '__version__ = '0.1.1''

requirements.txt

@@ -1,2 +1,4 @@
+setuptools==38.5.2
 pydot
 graphviz
+pyparsing

setup.py

@@ -11,40 +11,36 @@
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-requirements = ["graphviz", "pydot"]
+requirements = ["graphviz", "pydot", "pyparsing"]
 
-setup_requirements = ["graphviz", "pydot"]
+setup_requirements = ["graphviz", "pydot", "pyparsing"]
 
-test_requirements = ["graphviz", "pydot"]
+test_requirements = ["graphviz", "pydot", "pyparsing"]
 
 setup(
+    name='pythomata',
+    version='0.1.2',
+    description="Python implementation of automata.",
+    long_description=readme + '\n\n' + history,
     author="Marco Favorito",
     author_email='marco.favorito@gmail.com',
+    url='https://github.com/MarcoFavorito/pythomata',
+    packages=find_packages(include=['pythomata*']),
+    include_package_data=True,
+    install_requires=requirements,
+    license="MIT license",
+    zip_safe=False,
+    keywords='pythomata',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
-    description="Python implementation of automata.",
-    entry_points={
-        'console_scripts': [
-            'pythomata=pythomata.cli:main',
-        ],
-    },
-    install_requires=requirements,
-    license="MIT license",
-    long_description=readme + '\n\n' + history,
-    include_package_data=True,
-    keywords='pythomata',
-    name='pythomata',
-    packages=find_packages(include=['pythomata']),
-    setup_requires=setup_requirements,
     test_suite='tests',
+    setup_requires=setup_requirements,
     tests_require=test_requirements,
-    url='https://github.com/MarcoFavorito/pythomata',
-    version='0.1.1',
-    zip_safe=False,
 )

tests/automata/nfa_strings.dot

@@ -1,22 +1,22 @@
 digraph {
 	fake0 [style=invisible]
 	fake1 [style=invisible]
-	s4 [root=true]
-	s3 [shape=doublecircle]
 	s2 [shape=doublecircle]
 	s5
+	s3 [shape=doublecircle]
+	s4 [root=true]
 	s1 [root=true]
 	fake1 -> s1 [style=bold]
 	fake0 -> s4 [style=bold]
-	s3 -> s1 [label=b]
-	s5 -> s5 [label=b]
 	s5 -> s5 [label=a]
 	s5 -> s5 [label=c]
-	s1 -> s3 [label=b]
-	s1 -> s2 [label=b]
-	s1 -> s5 [label=c]
-	s4 -> s1 [label=b]
-	s4 -> s5 [label=b]
-	s4 -> s1 [label=c]
+	s5 -> s5 [label=b]
 	s2 -> s1 [label=b]
+	s4 -> s1 [label=c]
+	s4 -> s5 [label=b]
+	s4 -> s1 [label=b]
+	s1 -> s5 [label=c]
+	s1 -> s2 [label=b]
+	s1 -> s3 [label=b]
+	s3 -> s1 [label=b]
 }