Merge branch 'develop'

Author: shtaxxx

README.md

@@ -55,11 +55,13 @@ Contribute to Pyverilog
 
 Pyverilog project always welcomes questions, bug reports, feature proposals, and pull requests on [GitHub](https://github.com/PyHDI/Pyverilog).
 
-### for questions, bug reports, and feature proposals
+for questions, bug reports, and feature proposals
+--------------------
 
 Please leave your comment on the [issue tracker](https://github.com/PyHDI/Pyverilog/issues) on GitHub.
 
-### for pull requests
+for pull requests
+--------------------
 
 Please check "CONTRIBUTORS.md" for the contributors who provided pull requests.
 
@@ -90,20 +92,27 @@ sudo apt install iverilog
 ```
 
 - Jinja2: 2.10 or later
-- pytest: 3.2 or later
-- pytest-pythonpath: 0.7 or later
 
 ```
-pip3 install jinja2 pytest pytest-pythonpath
+pip3 install jinja2
 ```
 
-Options
+Optional Installation
 --------------------
 
+- pytest: 3.2 or later
+- pytest-pythonpath: 0.7 or later
+
+These are required for the testing execution of test codes in tests and examples.
+
+```
+pip3 install pytest pytest-pythonpath
+```
+
 - Graphviz: 2.38.0 or later
 - Pygraphviz: 1.3.1 or later
 
-These softwares are required for graph visualization by dataflow/graphgen.py and controlflow/controlflow_analyzer.py.
+These are required for graph visualization by dataflow/graphgen.py and controlflow/controlflow_analyzer.py.
 
 ```
 sudo apt install graphviz

README.rst

@@ -61,13 +61,13 @@ proposals, and pull requests on
 `GitHub <https://github.com/PyHDI/Pyverilog>`__.
 
 for questions, bug reports, and feature proposals
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------------
 
 Please leave your comment on the `issue
 tracker <https://github.com/PyHDI/Pyverilog/issues>`__ on GitHub.
 
 for pull requests
-~~~~~~~~~~~~~~~~~
+-----------------
 
 Please check “CONTRIBUTORS.md” for the contributors who provided pull
 requests.
@@ -101,21 +101,29 @@ Requirements
    sudo apt install iverilog
 
 -  Jinja2: 2.10 or later
+
+::
+
+   pip3 install jinja2
+
+Optional Installation
+---------------------
+
 -  pytest: 3.2 or later
 -  pytest-pythonpath: 0.7 or later
 
-::
+These are required for the testing execution of test codes in tests and
+examples.
 
-   pip3 install jinja2 pytest pytest-pythonpath
+::
 
-Options
--------
+   pip3 install pytest pytest-pythonpath
 
 -  Graphviz: 2.38.0 or later
 -  Pygraphviz: 1.3.1 or later
 
-These softwares are required for graph visualization by
-dataflow/graphgen.py and controlflow/controlflow_analyzer.py.
+These are required for graph visualization by dataflow/graphgen.py and
+controlflow/controlflow_analyzer.py.
 
 ::
 

setup.py

@@ -24,7 +24,7 @@ def read(filename):
       package_data={'pyverilog.ast_code_generator': ['template/*'], },
       install_requires=['Jinja2>=2.10'],
       extras_require={
-          'graph': ['pygraphviz>=1.3.1'],
           'test': ['pytest>=3.2', 'pytest-pythonpath>=0.7'],
+          'graph': ['pygraphviz>=1.3.1'],
       },
       )