Merge pull request #65 from alexshpilkin/fix-requirements

Add pluggy to install_requires and move pytest to tests_require

riscv_isac/requirements.txt

@@ -1,8 +1,8 @@
 click
+colorlog
 gitpython
-ruamel.yaml>=0.16.0
-pyyaml
+pluggy
 pyelftools==0.26
-colorlog
-pytest
 pytablewriter
+pyyaml
+ruamel.yaml>=0.16.0

riscv_isac/test_requirements.txt

@@ -0,0 +1 @@
+pytest

setup.py

@@ -12,8 +12,8 @@
 def read(*parts):
     with codecs.open(os.path.join(here, *parts), 'r') as fp:
         return fp.read()
-def read_requires():
-    with open(os.path.join(here, "riscv_isac/requirements.txt"),"r") as reqfile:
+def read_requires(name):
+    with open(os.path.join(here, "riscv_isac", name),"r") as reqfile:
         return reqfile.read().splitlines()
 
 #Long Description
@@ -22,8 +22,6 @@ def read_requires():
 
 setup_requirements = [ ]
 
-test_requirements = [ ]
-
 setup(
     name='riscv_isac',
     version='0.18.0',
@@ -45,7 +43,7 @@ def read_requires():
             'requirements.txt'
             ]
         },
-    install_requires=read_requires(),
+    install_requires=read_requires("requirements.txt"),
     python_requires='>=3.6.0',
     entry_points={
         'console_scripts': [
@@ -55,6 +53,6 @@ def read_requires():
     include_package_data=True,
     keywords='riscv_isac',
     test_suite='tests',
-    tests_require=test_requirements,
+    tests_require=read_requires("test_requirements.txt"),
     zip_safe=False,
 )