diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index f0c59307acb47e0d81c5eae6c286d96e29eccefb..87b099a7048c90f5fe33cf9fe8c1a043f622d903 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,19 +1,13 @@ -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") diff --git a/python/parfield/requirements.txt b/python/parfield/requirements.txt deleted file mode 100644 index 1d35cf0ea500da185ad239fe400ef0d75d2ddf25..0000000000000000000000000000000000000000 --- a/python/parfield/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -h5py -Pillow -configparser \ No newline at end of file diff --git a/python/parfield/setup.py b/python/parfield/setup.py index 2636459e23ac3fb03664ab044f1831d1b8e1f701..946188e66aa6199f19e926fa9ba7bf1ef2397c5e 100644 --- a/python/parfield/setup.py +++ b/python/parfield/setup.py @@ -13,7 +13,10 @@ setup(name='dorie.parfield', author='Dion Häfner ', 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'], diff --git a/python/parscraper/requirements.txt b/python/parscraper/requirements.txt deleted file mode 100644 index d48eb88258275045269544dc549b9343a5663d21..0000000000000000000000000000000000000000 --- a/python/parscraper/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -cycler -matplotlib -numpy -pyparsing -python-dateutil -pytz -scipy -six -wheel \ No newline at end of file diff --git a/python/parscraper/setup.py b/python/parscraper/setup.py index 47c2a04aa27357e9939a40d3236077850aca344f..d73c5b1321cb09f0b71d10341403aca36ff49c53 100644 --- a/python/parscraper/setup.py +++ b/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() ) diff --git a/python/testtools/requirements.txt b/python/testtools/requirements.txt deleted file mode 100644 index d48eb88258275045269544dc549b9343a5663d21..0000000000000000000000000000000000000000 --- a/python/testtools/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -cycler -matplotlib -numpy -pyparsing -python-dateutil -pytz -scipy -six -wheel \ No newline at end of file diff --git a/python/testtools/setup.py b/python/testtools/setup.py index 45707fda6ac5cdb966c95f4a89bd0a701595902b..f2d9724d535a5e3c4521ff85c794d7a6b22c5a04 100644 --- a/python/testtools/setup.py +++ b/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()) diff --git a/python/utilities/requirements.txt b/python/utilities/requirements.txt deleted file mode 100644 index d48eb88258275045269544dc549b9343a5663d21..0000000000000000000000000000000000000000 --- a/python/utilities/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -cycler -matplotlib -numpy -pyparsing -python-dateutil -pytz -scipy -six -wheel \ No newline at end of file diff --git a/python/utilities/setup.py b/python/utilities/setup.py index e08d85b1691f2af957f7960abaf45d23f34982f7..fd09f7c25b66f8eefc46677610cd2103bba85486 100644 --- a/python/utilities/setup.py +++ b/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() )