European-XFEL · RobertRosca · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020
diff --git a/setup.py b/setup.py
@@ -21,66 +21,68 @@ def find_version(*parts):
     raise RuntimeError("Unable to find version string.")
 
 
-setup(name="EXtra-data",
-      version=find_version("extra_data", "__init__.py"),
-      author="European XFEL GmbH",
-      author_email="da-support@xfel.eu",
-      maintainer="Thomas Michelat",
-      url="https://github.com/European-XFEL/EXtra-data",
-      description="Tools to read and analyse data from European XFEL ",
-      long_description=read("README.md"),
-      long_description_content_type='text/markdown',
-      license="BSD-3-Clause",
-      packages=find_packages(),
-      package_data={
-          'extra_data.tests': ['dssc_geo_june19.h5', 'lpd_mar_18.h5'],
-      },
-      entry_points={
-          "console_scripts": [
-              "lsxfel = extra_data.lsxfel:main",
-              "karabo-bridge-serve-files = extra_data.export:main",
-              "extra-data-validate = extra_data.validation:main",
-              "extra-data-make-virtual-cxi = extra_data.cli.make_virtual_cxi:main",
-              "extra-data-locality = extra_data.locality:main",
-          ],
-      },
-      install_requires=[
-          'fabio',
-          'h5py>=2.7.1',
-          'karabo-bridge >=0.6',
-          'matplotlib',
-          'numpy',
-          'pandas',
-          'psutil',
-          'scipy',
-          'xarray',
-      ],
-      extras_require={
-          'docs': [
-              'sphinx',
-              'nbsphinx',
-              'ipython',  # For nbsphinx syntax highlighting
-              'sphinxcontrib_github_alt',
-          ],
-          'test': [
-              'coverage',
-              'dask[array]',
-              'nbval',
-              'pytest',
-              'pytest-cov',
-              'testpath',
-          ]
-      },
-      python_requires='>=3.6',
-      classifiers=[
-          'Development Status :: 5 - Production/Stable',
-          'Environment :: Console',
-          'Intended Audience :: Developers',
-          'Intended Audience :: Science/Research',
-          'License :: OSI Approved :: BSD License',
-          'Operating System :: POSIX :: Linux',
-          'Programming Language :: Python :: 3',
-          'Topic :: Scientific/Engineering :: Information Analysis',
-          'Topic :: Scientific/Engineering :: Physics',
-      ]
+setup(
+    name="EXtra-data",
+    version=find_version("src", "extra_data", "__init__.py"),
+    author="European XFEL GmbH",
+    author_email="da-support@xfel.eu",
+    maintainer="Thomas Michelat",
+    url="https://github.com/European-XFEL/EXtra-data",
+    description="Tools to read and analyse data from European XFEL ",
+    long_description=read("README.md"),
+    long_description_content_type='text/markdown',
+    license="BSD-3-Clause",
+    packages=find_packages("src"),
+    package_data={
+        'extra_data.tests': ['dssc_geo_june19.h5', 'lpd_mar_18.h5'],
+    },
+    package_dir={"": "src"},
+    entry_points={
+        "console_scripts": [
+            "lsxfel = extra_data.lsxfel:main",
+            "karabo-bridge-serve-files = extra_data.export:main",
+            "extra-data-validate = extra_data.validation:main",
+            "extra-data-make-virtual-cxi = extra_data.cli.make_virtual_cxi:main",
+            "extra-data-locality = extra_data.locality:main",
+        ],
+    },
+    install_requires=[
+        'fabio',
+        'h5py>=2.7.1',
+        'karabo-bridge >=0.6',
+        'matplotlib',
+        'numpy',
+        'pandas',
+        'psutil',
+        'scipy',
+        'xarray',
+    ],
+    extras_require={
+        'docs': [
+            'sphinx',
+            'nbsphinx',
+            'ipython',  # For nbsphinx syntax highlighting
+            'sphinxcontrib_github_alt',
+        ],
+        'test': [
+            'coverage',
+            'dask[array]',
+            'nbval',
+            'pytest',
+            'pytest-cov',
+            'testpath',
+        ]
+    },
+    python_requires='>=3.6',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3',
+        'Topic :: Scientific/Engineering :: Information Analysis',
+        'Topic :: Scientific/Engineering :: Physics',
+    ]
 )
diff --git a/extra_data/__init__.py → src/extra_data/__init__.py b/extra_data/__init__.py → src/extra_data/__init__.py
diff --git a/extra_data/cli/__init__.py → src/extra_data/cli/__init__.py b/extra_data/cli/__init__.py → src/extra_data/cli/__init__.py
diff --git a/extra_data/cli/make_virtual_cxi.py → src/extra_data/cli/make_virtual_cxi.py b/extra_data/cli/make_virtual_cxi.py → src/extra_data/cli/make_virtual_cxi.py
diff --git a/extra_data/components.py → src/extra_data/components.py b/extra_data/components.py → src/extra_data/components.py
diff --git a/extra_data/exceptions.py → src/extra_data/exceptions.py b/extra_data/exceptions.py → src/extra_data/exceptions.py
diff --git a/extra_data/export.py → src/extra_data/export.py b/extra_data/export.py → src/extra_data/export.py
diff --git a/extra_data/file_access.py → src/extra_data/file_access.py b/extra_data/file_access.py → src/extra_data/file_access.py
diff --git a/extra_data/h5index.py → src/extra_data/h5index.py b/extra_data/h5index.py → src/extra_data/h5index.py
diff --git a/extra_data/keydata.py → src/extra_data/keydata.py b/extra_data/keydata.py → src/extra_data/keydata.py
diff --git a/extra_data/locality.py → src/extra_data/locality.py b/extra_data/locality.py → src/extra_data/locality.py
diff --git a/extra_data/lsxfel.py → src/extra_data/lsxfel.py b/extra_data/lsxfel.py → src/extra_data/lsxfel.py
diff --git a/extra_data/read_machinery.py → src/extra_data/read_machinery.py b/extra_data/read_machinery.py → src/extra_data/read_machinery.py
diff --git a/extra_data/reader.py → src/extra_data/reader.py b/extra_data/reader.py → src/extra_data/reader.py
diff --git a/extra_data/run_files_map.py → src/extra_data/run_files_map.py b/extra_data/run_files_map.py → src/extra_data/run_files_map.py
diff --git a/extra_data/stacking.py → src/extra_data/stacking.py b/extra_data/stacking.py → src/extra_data/stacking.py
diff --git a/extra_data/utils.py → src/extra_data/utils.py b/extra_data/utils.py → src/extra_data/utils.py
diff --git a/extra_data/validation.py → src/extra_data/validation.py b/extra_data/validation.py → src/extra_data/validation.py
diff --git a/extra_data/write_cxi.py → src/extra_data/write_cxi.py b/extra_data/write_cxi.py → src/extra_data/write_cxi.py
diff --git a/extra_data/writer.py → src/extra_data/writer.py b/extra_data/writer.py → src/extra_data/writer.py
diff --git a/extra_data/tests/__init__.py → tests/__init__.py b/extra_data/tests/__init__.py → tests/__init__.py
diff --git a/extra_data/tests/cli/__init__.py → tests/cli/__init__.py b/extra_data/tests/cli/__init__.py → tests/cli/__init__.py
diff --git a/...a_data/tests/cli/test_make_virtual_cxi.py → tests/cli/test_make_virtual_cxi.py b/...a_data/tests/cli/test_make_virtual_cxi.py → tests/cli/test_make_virtual_cxi.py
diff --git a/extra_data/tests/conftest.py → tests/conftest.py b/extra_data/tests/conftest.py → tests/conftest.py
diff --git a/extra_data/tests/make_examples.py → tests/make_examples.py b/extra_data/tests/make_examples.py → tests/make_examples.py
diff --git a/extra_data/tests/mockdata/__init__.py → tests/mockdata/__init__.py b/extra_data/tests/mockdata/__init__.py → tests/mockdata/__init__.py
diff --git a/extra_data/tests/mockdata/adc.py → tests/mockdata/adc.py b/extra_data/tests/mockdata/adc.py → tests/mockdata/adc.py
diff --git a/extra_data/tests/mockdata/base.py → tests/mockdata/base.py b/extra_data/tests/mockdata/base.py → tests/mockdata/base.py
diff --git a/extra_data/tests/mockdata/basler_camera.py → tests/mockdata/basler_camera.py b/extra_data/tests/mockdata/basler_camera.py → tests/mockdata/basler_camera.py
diff --git a/extra_data/tests/mockdata/control_common.py → tests/mockdata/control_common.py b/extra_data/tests/mockdata/control_common.py → tests/mockdata/control_common.py
diff --git a/extra_data/tests/mockdata/dctrl.py → tests/mockdata/dctrl.py b/extra_data/tests/mockdata/dctrl.py → tests/mockdata/dctrl.py
diff --git a/extra_data/tests/mockdata/detectors.py → tests/mockdata/detectors.py b/extra_data/tests/mockdata/detectors.py → tests/mockdata/detectors.py
diff --git a/extra_data/tests/mockdata/gauge.py → tests/mockdata/gauge.py b/extra_data/tests/mockdata/gauge.py → tests/mockdata/gauge.py
diff --git a/extra_data/tests/mockdata/gec_camera.py → tests/mockdata/gec_camera.py b/extra_data/tests/mockdata/gec_camera.py → tests/mockdata/gec_camera.py
diff --git a/extra_data/tests/mockdata/imgfel.py → tests/mockdata/imgfel.py b/extra_data/tests/mockdata/imgfel.py → tests/mockdata/imgfel.py
diff --git a/extra_data/tests/mockdata/mkfile.py → tests/mockdata/mkfile.py b/extra_data/tests/mockdata/mkfile.py → tests/mockdata/mkfile.py
diff --git a/extra_data/tests/mockdata/motor.py → tests/mockdata/motor.py b/extra_data/tests/mockdata/motor.py → tests/mockdata/motor.py
diff --git a/extra_data/tests/mockdata/mpod.py → tests/mockdata/mpod.py b/extra_data/tests/mockdata/mpod.py → tests/mockdata/mpod.py
diff --git a/extra_data/tests/mockdata/sidemic_camera.py → tests/mockdata/sidemic_camera.py b/extra_data/tests/mockdata/sidemic_camera.py → tests/mockdata/sidemic_camera.py
diff --git a/extra_data/tests/mockdata/tsens.py → tests/mockdata/tsens.py b/extra_data/tests/mockdata/tsens.py → tests/mockdata/tsens.py
diff --git a/extra_data/tests/mockdata/uvlamp.py → tests/mockdata/uvlamp.py b/extra_data/tests/mockdata/uvlamp.py → tests/mockdata/uvlamp.py
diff --git a/extra_data/tests/mockdata/xgm.py → tests/mockdata/xgm.py b/extra_data/tests/mockdata/xgm.py → tests/mockdata/xgm.py
diff --git a/extra_data/tests/test_components.py → tests/test_components.py b/extra_data/tests/test_components.py → tests/test_components.py
diff --git a/extra_data/tests/test_keydata.py → tests/test_keydata.py b/extra_data/tests/test_keydata.py → tests/test_keydata.py
diff --git a/extra_data/tests/test_lsxfel.py → tests/test_lsxfel.py b/extra_data/tests/test_lsxfel.py → tests/test_lsxfel.py
diff --git a/extra_data/tests/test_open_file_limiter.py → tests/test_open_file_limiter.py b/extra_data/tests/test_open_file_limiter.py → tests/test_open_file_limiter.py
diff --git a/extra_data/tests/test_read_machinery.py → tests/test_read_machinery.py b/extra_data/tests/test_read_machinery.py → tests/test_read_machinery.py
diff --git a/extra_data/tests/test_reader_mockdata.py → tests/test_reader_mockdata.py b/extra_data/tests/test_reader_mockdata.py → tests/test_reader_mockdata.py
diff --git a/extra_data/tests/test_run_files_map.py → tests/test_run_files_map.py b/extra_data/tests/test_run_files_map.py → tests/test_run_files_map.py
diff --git a/extra_data/tests/test_slice_objs.py → tests/test_slice_objs.py b/extra_data/tests/test_slice_objs.py → tests/test_slice_objs.py
diff --git a/extra_data/tests/test_stacking.py → tests/test_stacking.py b/extra_data/tests/test_stacking.py → tests/test_stacking.py
diff --git a/extra_data/tests/test_streamer.py → tests/test_streamer.py b/extra_data/tests/test_streamer.py → tests/test_streamer.py
diff --git a/extra_data/tests/test_utils.py → tests/test_utils.py b/extra_data/tests/test_utils.py → tests/test_utils.py
diff --git a/extra_data/tests/test_validation.py → tests/test_validation.py b/extra_data/tests/test_validation.py → tests/test_validation.py
diff --git a/extra_data/tests/test_writer.py → tests/test_writer.py b/extra_data/tests/test_writer.py → tests/test_writer.py