loading requirements from file

Author: tulinkry

opengrok-tools/pom.xml

@@ -152,6 +152,8 @@ Portions Copyright (c) 2017-2018, 2020, Chris Fraire <cfraire@me.com>.
                                     <includes>
                                         <include>MANIFEST.in</include>
                                         <include>README-dist.txt</include>
+                                        <include>requirements.txt</include>
+                                        <include>requirements-tests.txt</include>
                                         <include>setup.py</include>
                                         <include>setup.cfg</include>
                                     </includes>
@@ -224,9 +226,11 @@ Portions Copyright (c) 2017-2018, 2020, Chris Fraire <cfraire@me.com>.
                     <execution>
                         <id>Install requirements via pip</id>
                         <configuration>
-                            <executable>${python.environment}/pip</executable>
+                            <executable>${python.environment}/python</executable>
                             <workingDirectory>${project.build.directory}</workingDirectory>
                             <arguments>
+                                <argument>-m</argument>
+                                <argument>pip</argument>
                                 <argument>install</argument>
                                 <argument>-r</argument>
                                 <argument>${project.basedir}/requirements.txt</argument>
@@ -240,12 +244,14 @@ Portions Copyright (c) 2017-2018, 2020, Chris Fraire <cfraire@me.com>.
                     <execution>
                         <id>Install test modules via pip</id>
                         <configuration>
-                            <executable>${python.environment}/pip</executable>
+                            <executable>${python.environment}/python</executable>
                             <workingDirectory>${project.build.directory}</workingDirectory>
                             <arguments>
+                                <argument>-m</argument>
+                                <argument>pip</argument>
                                 <argument>install</argument>
                                 <argument>-r</argument>
-                                <argument>${project.basedir}/tests.txt</argument>
+                                <argument>${project.basedir}/requirements-tests.txt</argument>
                             </arguments>
                         </configuration>
                         <phase>test</phase>

opengrok-tools/tests.txt renamed to opengrok-tools/requirements-tests.txt

@@ -1,14 +1,6 @@
-certifi==2018.8.24
-chardet==3.0.4
-filelock==3.0.10
-idna==2.7
-JsonForm==0.0.2
 jsonschema==2.6.0
-JsonSir==0.0.2
-Python-EasyConfig==0.1.7
-PyYAML==3.13
-requests==2.20.0
-Resource==0.2.1
-six==1.11.0
-urllib3==1.23
-GitPython==3.0.6
+pyyaml
+requests>=2.20.0
+resource
+filelock
+setuptools>=36.7.2

opengrok-tools/requirements.txt

@@ -1,4 +1,5 @@
 import os
+
 from setuptools import setup
 
 from src.main.python.opengrok_tools.version import __version__ as version
@@ -11,6 +12,11 @@ def readme():
         return readme.read()
 
 
+def readlines(file):
+    with open(os.path.join(SCRIPT_DIR, file), 'r') as file:
+        return list(map(str.strip, file.readlines()))
+
+
 setup(
     name='opengrok-tools',
     version=version,
@@ -31,25 +37,12 @@ def readme():
     description='Tools for managing OpenGrok instance',
     long_description=readme(),
     python_requires='>=3.4, <4',
-    install_requires=[
-        'jsonschema==2.6.0',
-        'pyyaml',
-        'requests>=2.20.0',
-        'resource',
-        'filelock',
-        'setuptools>=36.7.2',
-    ],
+    install_requires=readlines('requirements.txt'),
     setup_requires=[
         'pytest-runner',
         'setuptools>=36.7.2',
     ],
-    tests_require=[
-        'pytest',
-        'GitPython',
-        'pytest-xdist',
-        'mockito',
-        'pytest-mockito',
-    ],
+    tests_require=readlines('requirements-tests.txt'),
     entry_points={
         'console_scripts': [
             'opengrok-config-merge=opengrok_tools.config_merge:main',