setup.py

Author: shtaxxx

README.md

@@ -84,16 +84,17 @@ Requirements
 sudo apt install iverilog
 ```
 
+- Pyverilog: 1.1.3 or later
 - Jinja2: 2.10 or later
+- NumPy: 1.14 or later
 - pytest: 3.2 or later
 - pytest-pythonpath: 0.7 or later
-- Pyverilog: 1.1.3 or later
 
 ```
-pip3 install jinja2 pytest pytest-pythonpath pyverilog ipgen
+pip3 install pyverilog jinja2 numpy pytest pytest-pythonpath
 ```
 
-Options
+Optional depedency
 --------------------
 
 - Graphviz: 2.38.0 or later
@@ -106,14 +107,6 @@ sudo apt install graphviz
 pip3 install pygraphviz
 ```
 
-- NumPy: 1.14 or later
-
-This is required for the memory image generation function of types.axi.AxiMemoryModel from Python list or numpy.ndarray:
-
-```
-pip3 install numpy
-```
-
 Install
 --------------------
 

README.rst

@@ -99,17 +99,18 @@ Requirements
 
    sudo apt install iverilog
 
+-  Pyverilog: 1.1.3 or later
 -  Jinja2: 2.10 or later
+-  NumPy: 1.14 or later
 -  pytest: 3.2 or later
 -  pytest-pythonpath: 0.7 or later
--  Pyverilog: 1.1.3 or later
 
 ::
 
-   pip3 install jinja2 pytest pytest-pythonpath pyverilog ipgen
+   pip3 install pyverilog jinja2 numpy pytest pytest-pythonpath
 
-Options
--------
+Optional depedency
+------------------
 
 -  Graphviz: 2.38.0 or later
 -  Pygraphviz: 1.3.1 or later
@@ -122,15 +123,6 @@ veriloggen.dataflow:
    sudo apt install graphviz
    pip3 install pygraphviz
 
--  NumPy: 1.14 or later
-
-This is required for the memory image generation function of
-types.axi.AxiMemoryModel from Python list or numpy.ndarray:
-
-::
-
-   pip3 install numpy
-
 Install
 -------
 

setup.py

@@ -23,10 +23,12 @@ def read(filename):
       packages=find_packages(),
       package_data={'veriloggen.utils': ['VERSION'],
                     'veriloggen.simulation': ['*.cpp'], },
-      install_requires=['pyverilog>=1.1.3', 'Jinja2>=2.10'],
+      install_requires=['pyverilog>=1.1.3', 
+                        'Jinja2>=2.10',
+                        'numpy>=1.14',
+                        'pytest>=3.2',
+                        'pytest-pythonpath>=0.7'],
       extras_require={
           'graph': ['pygraphviz>=1.3.1'],
-          'test': ['pytest>=3.2', 'pytest-pythonpath>=0.7'],
-          'memimg': ['numpy>=1.14'],
       },
       )