Revert "rolled back to requirements.txt files for supporting reinstallation of...

Revert "rolled back to requirements.txt files for supporting reinstallation of the dorie python modules"

This reverts commit b314fbc6.

python/CMakeLists.txt

-function(dorie_python_install_package directory)
-	dune_python_install_package(PATH ${directory}
-		ADDITIONAL_PIP_PARAMS --force-reinstall --upgrade --no-deps
-			-r ${CMAKE_CURRENT_SOURCE_DIR}/${directory}/requirements.txt)
-endfunction()
-
 # install required python modules
-dorie_python_install_package(utilities)
-dorie_python_install_package(parscraper)
+dune_python_install_package(PATH utilities)
+dune_python_install_package(PATH parscraper)
 add_subdirectory(parfield/wrapper)
-dorie_python_install_package(parfield)
+dune_python_install_package(PATH parfield)
 
 # install testing module
 if(dune-testtools_FOUND)
 	add_subdirectory(testtools/wrapper)
-    dorie_python_install_package(testtools)
+    dune_python_install_package(PATH testtools)
 endif()
 
 set(DORIE_PYTHON_MODULES ${python_paths} CACHE PATH "Paths to the python modules")

python/parfield/requirements.txt

-h5py
-Pillow
-configparser
\ No newline at end of file

python/parfield/setup.py

@@ -13,7 +13,10 @@ setup(name='dorie.parfield',
       author='Dion Häfner <mail@dionhaefner.de>',
       author_email='dorieteam@iup.uni-heidelberg.de',
       url='',
-      install_requires=['dorie.utilities'],
+      install_requires=['dorie.utilities',
+                        'h5py',
+                        'Pillow',
+                        'configparser'],
       packages =  ['dorie.parfield',
                   'dorie.parfield.converter',
                   'dorie.parfield.parameterization'],

python/parscraper/requirements.txt

-cycler
-matplotlib
-numpy
-pyparsing
-python-dateutil
-pytz
-scipy
-six
-wheel
\ No newline at end of file

python/parscraper/setup.py

@@ -17,5 +17,15 @@ setup(name='dorie.parscraper',
                   'dorie.parscraper.wrapper',
                   'dorie.parscraper.writers',
                   'dorie.parscraper.readers'],
+      install_requires= ['cycler',
+                        'matplotlib',
+                        'numpy',
+                        'pyparsing',
+                        'python-dateutil',
+                        'pytz',
+                        'scipy',
+                        'six',
+                        'wheel'
+      ],
       scripts=dorie_parscraper_scripts()
       )

python/testtools/requirements.txt

-cycler
-matplotlib
-numpy
-pyparsing
-python-dateutil
-pytz
-scipy
-six
-wheel
\ No newline at end of file

python/testtools/setup.py

@@ -22,5 +22,14 @@ setup(name='dorie.testtools',
             'dorie.testtools.utilities',
             'dorie.testtools.wrapper'
             ],
-      install_requires=['dune.testtools'],
+      install_requires=['dune.testtools',
+                        'cycler',
+                        'matplotlib',
+                        'numpy',
+                        'pyparsing',
+                        'python-dateutil',
+                        'pytz',
+                        'scipy',
+                        'six',
+                        'wheel'],
       scripts=dorie_testtools_scripts())

python/utilities/requirements.txt

-cycler
-matplotlib
-numpy
-pyparsing
-python-dateutil
-pytz
-scipy
-six
-wheel
\ No newline at end of file

python/utilities/setup.py

@@ -16,5 +16,14 @@ setup(name='dorie.utilities',
       url='',
       packages=['dorie.utilities',
                   'dorie.utilities.vtktools'],
+      install_requires=['cycler',
+                        'matplotlib',
+                        'numpy',
+                        'pyparsing',
+                        'python-dateutil',
+                        'pytz',
+                        'scipy',
+                        'six',
+                        'wheel'],
       scripts=dorie_utilities_scripts()
       )