diff --git a/setup.py b/setup.py index ccff76b..76c7953 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,19 @@ from setuptools import setup, find_packages setup( - name = "HelloWorld", + name = "QDSfit", version = "0.1", - packages = find_packages(), + packages = find_packages("src"), + author="Markus Rosenstihl", + author_email="markus.rosenstihl@physik.tu-darmstadt.de", + description="QDSfit is a program to fit Broadband Dielectric Data", + scripts = ["src/qds.py"], + package_dir = {'':'src'}, + package_data = { + # If any package contains *.txt or *.rst files, include them: + '': ['*.ui'], + # And include any *.msg files found in the 'hello' package, too: + 'hello': ['*.msg'], + }, + license="BSD", + url="https://chaos3.fkp.physik.tu-darmstadt.de/diffusion/QD/QDSfit/" ) diff --git a/Makefile b/src/Makefile similarity index 100% rename from Makefile rename to src/Makefile diff --git a/data/Container.py b/src/data/Container.py similarity index 100% rename from data/Container.py rename to src/data/Container.py diff --git a/data/__init__.py b/src/data/__init__.py similarity index 100% rename from data/__init__.py rename to src/data/__init__.py diff --git a/data/container_base.py b/src/data/container_base.py similarity index 100% rename from data/container_base.py rename to src/data/container_base.py diff --git a/data/data.py b/src/data/data.py similarity index 100% rename from data/data.py rename to src/data/data.py diff --git a/data/experimental.py b/src/data/experimental.py similarity index 100% rename from data/experimental.py rename to src/data/experimental.py diff --git a/fileio/__init__.py b/src/fileio/__init__.py similarity index 100% rename from fileio/__init__.py rename to src/fileio/__init__.py diff --git a/fileio/bds_file_reader.py b/src/fileio/bds_file_reader.py similarity index 100% rename from fileio/bds_file_reader.py rename to src/fileio/bds_file_reader.py diff --git a/fileio/gracedriver.py b/src/fileio/gracedriver.py similarity index 100% rename from fileio/gracedriver.py rename to src/fileio/gracedriver.py diff --git a/gui/ExtraDifferentialWidget.py b/src/gui/ExtraDifferentialWidget.py similarity index 100% rename from gui/ExtraDifferentialWidget.py rename to src/gui/ExtraDifferentialWidget.py diff --git a/gui/__init__.py b/src/gui/__init__.py similarity index 100% rename from gui/__init__.py rename to src/gui/__init__.py diff --git a/gui/container_widgets.py b/src/gui/container_widgets.py similarity index 100% rename from gui/container_widgets.py rename to src/gui/container_widgets.py diff --git a/gui/graphs.py b/src/gui/graphs.py similarity index 100% rename from gui/graphs.py rename to src/gui/graphs.py diff --git a/libmath/BDSlib.py b/src/libmath/BDSlib.py similarity index 100% rename from libmath/BDSlib.py rename to src/libmath/BDSlib.py diff --git a/libmath/__init__.py b/src/libmath/__init__.py similarity index 100% rename from libmath/__init__.py rename to src/libmath/__init__.py diff --git a/libmath/functions.py b/src/libmath/functions.py similarity index 100% rename from libmath/functions.py rename to src/libmath/functions.py diff --git a/libmath/yafflib.py b/src/libmath/yafflib.py similarity index 100% rename from libmath/yafflib.py rename to src/libmath/yafflib.py diff --git a/qds.py b/src/qds.py similarity index 100% rename from qds.py rename to src/qds.py diff --git a/ui/ConductivityGroupBox.py b/src/ui/ConductivityGroupBox.py similarity index 100% rename from ui/ConductivityGroupBox.py rename to src/ui/ConductivityGroupBox.py diff --git a/ui/ConductivityGroupBox.ui b/src/ui/ConductivityGroupBox.ui similarity index 100% rename from ui/ConductivityGroupBox.ui rename to src/ui/ConductivityGroupBox.ui diff --git a/ui/ConfigurationOptions.ui b/src/ui/ConfigurationOptions.ui similarity index 100% rename from ui/ConfigurationOptions.ui rename to src/ui/ConfigurationOptions.ui diff --git a/ui/ExtraDifferential.py b/src/ui/ExtraDifferential.py similarity index 100% rename from ui/ExtraDifferential.py rename to src/ui/ExtraDifferential.py diff --git a/ui/ExtraDifferential.ui b/src/ui/ExtraDifferential.ui similarity index 100% rename from ui/ExtraDifferential.ui rename to src/ui/ExtraDifferential.ui diff --git a/ui/PeakGroupBox.py b/src/ui/PeakGroupBox.py similarity index 100% rename from ui/PeakGroupBox.py rename to src/ui/PeakGroupBox.py diff --git a/ui/PeakGroupBox.ui b/src/ui/PeakGroupBox.ui similarity index 100% rename from ui/PeakGroupBox.ui rename to src/ui/PeakGroupBox.ui diff --git a/ui/PowerLawGroupBox.py b/src/ui/PowerLawGroupBox.py similarity index 100% rename from ui/PowerLawGroupBox.py rename to src/ui/PowerLawGroupBox.py diff --git a/ui/PowerLawGroupBox.ui b/src/ui/PowerLawGroupBox.ui similarity index 100% rename from ui/PowerLawGroupBox.ui rename to src/ui/PowerLawGroupBox.ui diff --git a/ui/QDSMain.py b/src/ui/QDSMain.py similarity index 100% rename from ui/QDSMain.py rename to src/ui/QDSMain.py diff --git a/ui/QDSMain.ui b/src/ui/QDSMain.ui similarity index 100% rename from ui/QDSMain.ui rename to src/ui/QDSMain.ui diff --git a/ui/StaticGroupBox.py b/src/ui/StaticGroupBox.py similarity index 100% rename from ui/StaticGroupBox.py rename to src/ui/StaticGroupBox.py diff --git a/ui/StaticGroupBox.ui b/src/ui/StaticGroupBox.ui similarity index 100% rename from ui/StaticGroupBox.ui rename to src/ui/StaticGroupBox.ui diff --git a/ui/YAFFConfig.py b/src/ui/YAFFConfig.py similarity index 100% rename from ui/YAFFConfig.py rename to src/ui/YAFFConfig.py diff --git a/ui/YAFFConfig.ui b/src/ui/YAFFConfig.ui similarity index 100% rename from ui/YAFFConfig.ui rename to src/ui/YAFFConfig.ui diff --git a/ui/YAFFparameters.py b/src/ui/YAFFparameters.py similarity index 100% rename from ui/YAFFparameters.py rename to src/ui/YAFFparameters.py diff --git a/ui/YAFFparameters.ui b/src/ui/YAFFparameters.ui similarity index 100% rename from ui/YAFFparameters.ui rename to src/ui/YAFFparameters.ui diff --git a/ui/__init__.py b/src/ui/__init__.py similarity index 100% rename from ui/__init__.py rename to src/ui/__init__.py diff --git a/ui/icons/add_cond.qrc b/src/ui/icons/add_cond.qrc similarity index 100% rename from ui/icons/add_cond.qrc rename to src/ui/icons/add_cond.qrc diff --git a/ui/icons/add_cond.svg b/src/ui/icons/add_cond.svg similarity index 100% rename from ui/icons/add_cond.svg rename to src/ui/icons/add_cond.svg diff --git a/ui/icons/add_eps_infty.png b/src/ui/icons/add_eps_infty.png similarity index 100% rename from ui/icons/add_eps_infty.png rename to src/ui/icons/add_eps_infty.png diff --git a/ui/icons/add_eps_infty.svg b/src/ui/icons/add_eps_infty.svg similarity index 100% rename from ui/icons/add_eps_infty.svg rename to src/ui/icons/add_eps_infty.svg diff --git a/ui/icons/add_peak.qrc b/src/ui/icons/add_peak.qrc similarity index 100% rename from ui/icons/add_peak.qrc rename to src/ui/icons/add_peak.qrc diff --git a/ui/icons/add_peak.svg b/src/ui/icons/add_peak.svg similarity index 100% rename from ui/icons/add_peak.svg rename to src/ui/icons/add_peak.svg diff --git a/ui/icons/add_yaff.png b/src/ui/icons/add_yaff.png similarity index 100% rename from ui/icons/add_yaff.png rename to src/ui/icons/add_yaff.png diff --git a/ui/icons/append_save_fit.png b/src/ui/icons/append_save_fit.png similarity index 100% rename from ui/icons/append_save_fit.png rename to src/ui/icons/append_save_fit.png diff --git a/ui/icons/append_save_fit.svg b/src/ui/icons/append_save_fit.svg similarity index 100% rename from ui/icons/append_save_fit.svg rename to src/ui/icons/append_save_fit.svg diff --git a/ui/icons/border-1d-left-icon.png b/src/ui/icons/border-1d-left-icon.png similarity index 100% rename from ui/icons/border-1d-left-icon.png rename to src/ui/icons/border-1d-left-icon.png diff --git a/ui/icons/border-1d-right-icon.png b/src/ui/icons/border-1d-right-icon.png similarity index 100% rename from ui/icons/border-1d-right-icon.png rename to src/ui/icons/border-1d-right-icon.png diff --git a/ui/icons/fit_limits.png b/src/ui/icons/fit_limits.png similarity index 100% rename from ui/icons/fit_limits.png rename to src/ui/icons/fit_limits.png diff --git a/ui/icons/fit_limits.qrc b/src/ui/icons/fit_limits.qrc similarity index 100% rename from ui/icons/fit_limits.qrc rename to src/ui/icons/fit_limits.qrc diff --git a/ui/icons/fit_limits.svg b/src/ui/icons/fit_limits.svg similarity index 100% rename from ui/icons/fit_limits.svg rename to src/ui/icons/fit_limits.svg diff --git a/ui/icons/images.qrc b/src/ui/icons/images.qrc similarity index 100% rename from ui/icons/images.qrc rename to src/ui/icons/images.qrc diff --git a/ui/icons/qds_fit_abort.png b/src/ui/icons/qds_fit_abort.png similarity index 100% rename from ui/icons/qds_fit_abort.png rename to src/ui/icons/qds_fit_abort.png diff --git a/ui/icons/qds_icons.graffle b/src/ui/icons/qds_icons.graffle similarity index 100% rename from ui/icons/qds_icons.graffle rename to src/ui/icons/qds_icons.graffle diff --git a/ui/icons/qds_icons.svg b/src/ui/icons/qds_icons.svg similarity index 100% rename from ui/icons/qds_icons.svg rename to src/ui/icons/qds_icons.svg diff --git a/ui/icons/save_fit.png b/src/ui/icons/save_fit.png similarity index 100% rename from ui/icons/save_fit.png rename to src/ui/icons/save_fit.png diff --git a/ui/icons/save_fit.qrc b/src/ui/icons/save_fit.qrc similarity index 100% rename from ui/icons/save_fit.qrc rename to src/ui/icons/save_fit.qrc diff --git a/ui/icons/save_fit.svg b/src/ui/icons/save_fit.svg similarity index 100% rename from ui/icons/save_fit.svg rename to src/ui/icons/save_fit.svg diff --git a/ui/images_rc.py b/src/ui/images_rc.py similarity index 100% rename from ui/images_rc.py rename to src/ui/images_rc.py