From 0f60f069646ad2cf6b4413be869d4819bf5f9e30 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Thu, 15 Jan 2026 13:46:19 +0100 Subject: [PATCH] Merge code --- .gitea/workflows/action.yaml | 172 +----------------- daq/docs/CHANGELOG.md => CHANGELOG.md | 3 +- daq/docs/README.md => README.md | 0 common/pyproject.toml | 25 --- daq/docs/conf.py | 149 --------------- daq/docs/index.rst | 30 --- daq/docs/requirements.txt | 37 ---- gui/pyproject.toml | 28 --- daq/pyproject.toml => pyproject.toml | 13 +- scripts/knife_edge_scan.ipynb | 2 +- .../aaredaqlib => src/aaredaq}/__init__.py | 0 {daq/src => src}/aaredaq/aaredb.py | 0 {daq/src => src}/aaredaq/auth.py | 0 {daq/src => src}/aaredaq/autofocus.py | 0 {daq/src => src}/aaredaq/beamcenterfit.py | 0 {daq/src => src}/aaredaq/config.py | 0 {daq/src => src}/aaredaq/daq.py | 3 +- {daq/src => src}/aaredaq/devices.py | 0 {daq/src => src}/aaredaq/mlbox.py | 0 {daq/src => src}/aaredaq/server.py | 3 +- .../src => src}/aaredaq/spreadsheetupdater.py | 0 {daq/src => src}/aaredaq/tellupdater.py | 0 {daq/src => src}/aaredaq/workflows.py | 0 .../aaredaq => src/aaredaqlib}/__init__.py | 0 {common/src => src}/aaredaqlib/beamline.py | 0 {common/src => src}/aaredaqlib/coordinate.py | 0 .../aaredaqlib/diffraction_geometry.py | 0 .../src => src}/aaredaqlib/face_detection.py | 0 {common/src => src}/aaredaqlib/find_xtal.py | 0 .../src => src}/aaredaqlib/logger_config.py | 0 {common/src => src}/aaredaqlib/models.py | 0 {common/src => src}/aaredaqlib/raster_grid.py | 0 .../src => src}/aaredaqlib/rotation_scan.py | 0 .../src => src}/aaredaqlib/sample_geometry.py | 0 {daq/src/mxlibs3 => src/aaregui}/__init__.py | 0 {gui/src => src}/aaregui/auth.py | 0 {gui/src => src}/aaregui/gui.py | 0 {gui/src => src}/aaregui/main_window.py | 0 .../aaregui/models}/__init__.py | 0 {gui/src => src}/aaregui/models/bookmark.py | 0 .../aaregui/models/sample_queue_model.py | 0 .../aaregui/models/user_sample_model.py | 0 {gui/src => src}/aaregui/panels/LogPanel.py | 0 .../models => src/aaregui/panels}/__init__.py | 0 .../aaregui/panels/abr_tweak_panel.py | 0 .../aaregui/panels/beam_center_panel.py | 0 .../aaregui/panels/beam_mark_panel.py | 0 .../aaregui/panels/beam_size_panel.py | 0 .../aaregui/panels/beamline_controls.py | 0 .../aaregui/panels/beamline_state_panel.py | 0 .../panels/data_collection_settings.py | 0 .../aaregui/panels/face_detection_panel.py | 0 .../aaregui/panels/file_path_panel.py | 0 .../panels/fluorescence_data_collection.py | 0 .../aaregui/panels/fluorescence_panel.py | 0 .../aaregui/panels/illumination_panel.py | 0 .../aaregui/panels/loop_centering_panel.py | 0 .../aaregui/panels/manual_sample_panel.py | 0 .../src => src}/aaregui/panels/omega_panel.py | 0 .../aaregui/panels/raster_data_collection.py | 0 .../aaregui/panels/reference_tools_panel.py | 0 .../panels/rotation_data_collection.py | 0 .../aaregui/panels/samcam_panel.py | 0 .../aaregui/panels/sample_queue_panel.py | 0 .../aaregui/panels/scan_settings_panel.py | 0 .../aaregui/panels/smargon_panel.py | 0 .../aaregui/panels/smart_rotation_panel.py | 0 .../aaregui/panels/status_panel.py | 0 .../aaregui/panels/tell_sample_panel.py | 0 {gui/src => src}/aaregui/panels/zoom_panel.py | 0 .../aaregui/scan_logic}/__init__.py | 0 .../aaregui/scan_logic/raster_grid_manager.py | 0 .../scan_logic/rotation_scan_manager.py | 0 .../aaregui/scan_logic/sample_mount_logic.py | 0 .../aaregui/threads}/__init__.py | 0 .../aaregui/threads/axis_video_thread.py | 0 .../aaregui/threads/camera_thread.py | 0 .../src => src}/aaregui/threads/daq_worker.py | 0 .../aaregui/threads/jfjoch_viewer.py | 0 .../src => src}/aaregui/threads/sse_client.py | 0 .../aaregui/widgets}/__init__.py | 0 .../aaregui/widgets/button_with_payload.py | 0 .../aaregui/widgets/camera_image.py | 0 .../aaregui/widgets/clickable_label.py | 0 {gui/src => src}/aaregui/widgets/login.py | 0 .../aaregui/widgets/message_box.py | 0 .../aaregui/widgets/no_wheel_scroll_area.py | 0 .../aaregui/widgets/number_line_edit.py | 0 .../aaregui/widgets/pgroup_dialog.py | 0 .../aaregui/widgets/raster_grid_table.py | 0 .../src => src}/aaregui/widgets/status_bar.py | 0 .../aaregui/widgets/status_label.py | 0 .../aaregui/widgets/title_label.py | 0 .../aaregui/widgets/value_label.py | 0 .../aaregui/widgets/video_image.py | 0 .../widgets => src/mxlibs3}/__init__.py | 0 {daq/src => src}/mxlibs3/aerotech.py | 0 {daq/src => src}/mxlibs3/area_detector.py | 0 {daq/src => src}/mxlibs3/enum_pv.py | 0 .../mxlibs3/experimental_hutch_shutter.py | 0 .../mxlibs3/filter_transmission.py | 0 {daq/src => src}/mxlibs3/fluorimeter.py | 0 {daq/src => src}/mxlibs3/jfjoch.py | 0 {daq/src => src}/mxlibs3/mx_lib.py | 0 {daq/src => src}/mxlibs3/my_motor.py | 0 {daq/src => src}/mxlibs3/non_standard.py | 0 {daq/src => src}/mxlibs3/pshell_client.py | 0 {daq/src => src}/mxlibs3/smargon.py | 0 {daq/src => src}/mxlibs3/tell_client.py | 0 {daq/src => src}/mxlibs3/workflow_tools.py | 0 update_version.sh | 9 - 111 files changed, 17 insertions(+), 457 deletions(-) rename daq/docs/CHANGELOG.md => CHANGELOG.md (94%) rename daq/docs/README.md => README.md (100%) delete mode 100644 common/pyproject.toml delete mode 100644 daq/docs/conf.py delete mode 100644 daq/docs/index.rst delete mode 100644 daq/docs/requirements.txt delete mode 100644 gui/pyproject.toml rename daq/pyproject.toml => pyproject.toml (74%) rename {common/src/aaredaqlib => src/aaredaq}/__init__.py (100%) rename {daq/src => src}/aaredaq/aaredb.py (100%) rename {daq/src => src}/aaredaq/auth.py (100%) rename {daq/src => src}/aaredaq/autofocus.py (100%) rename {daq/src => src}/aaredaq/beamcenterfit.py (100%) rename {daq/src => src}/aaredaq/config.py (100%) rename {daq/src => src}/aaredaq/daq.py (99%) rename {daq/src => src}/aaredaq/devices.py (100%) rename {daq/src => src}/aaredaq/mlbox.py (100%) rename {daq/src => src}/aaredaq/server.py (99%) rename {daq/src => src}/aaredaq/spreadsheetupdater.py (100%) rename {daq/src => src}/aaredaq/tellupdater.py (100%) rename {daq/src => src}/aaredaq/workflows.py (100%) rename {daq/src/aaredaq => src/aaredaqlib}/__init__.py (100%) rename {common/src => src}/aaredaqlib/beamline.py (100%) rename {common/src => src}/aaredaqlib/coordinate.py (100%) rename {common/src => src}/aaredaqlib/diffraction_geometry.py (100%) rename {common/src => src}/aaredaqlib/face_detection.py (100%) rename {common/src => src}/aaredaqlib/find_xtal.py (100%) rename {common/src => src}/aaredaqlib/logger_config.py (100%) rename {common/src => src}/aaredaqlib/models.py (100%) rename {common/src => src}/aaredaqlib/raster_grid.py (100%) rename {common/src => src}/aaredaqlib/rotation_scan.py (100%) rename {common/src => src}/aaredaqlib/sample_geometry.py (100%) rename {daq/src/mxlibs3 => src/aaregui}/__init__.py (100%) rename {gui/src => src}/aaregui/auth.py (100%) rename {gui/src => src}/aaregui/gui.py (100%) rename {gui/src => src}/aaregui/main_window.py (100%) rename {gui/src/aaregui => src/aaregui/models}/__init__.py (100%) rename {gui/src => src}/aaregui/models/bookmark.py (100%) rename {gui/src => src}/aaregui/models/sample_queue_model.py (100%) rename {gui/src => src}/aaregui/models/user_sample_model.py (100%) rename {gui/src => src}/aaregui/panels/LogPanel.py (100%) rename {gui/src/aaregui/models => src/aaregui/panels}/__init__.py (100%) rename {gui/src => src}/aaregui/panels/abr_tweak_panel.py (100%) rename {gui/src => src}/aaregui/panels/beam_center_panel.py (100%) rename {gui/src => src}/aaregui/panels/beam_mark_panel.py (100%) rename {gui/src => src}/aaregui/panels/beam_size_panel.py (100%) rename {gui/src => src}/aaregui/panels/beamline_controls.py (100%) rename {gui/src => src}/aaregui/panels/beamline_state_panel.py (100%) rename {gui/src => src}/aaregui/panels/data_collection_settings.py (100%) rename {gui/src => src}/aaregui/panels/face_detection_panel.py (100%) rename {gui/src => src}/aaregui/panels/file_path_panel.py (100%) rename {gui/src => src}/aaregui/panels/fluorescence_data_collection.py (100%) rename {gui/src => src}/aaregui/panels/fluorescence_panel.py (100%) rename {gui/src => src}/aaregui/panels/illumination_panel.py (100%) rename {gui/src => src}/aaregui/panels/loop_centering_panel.py (100%) rename {gui/src => src}/aaregui/panels/manual_sample_panel.py (100%) rename {gui/src => src}/aaregui/panels/omega_panel.py (100%) rename {gui/src => src}/aaregui/panels/raster_data_collection.py (100%) rename {gui/src => src}/aaregui/panels/reference_tools_panel.py (100%) rename {gui/src => src}/aaregui/panels/rotation_data_collection.py (100%) rename {gui/src => src}/aaregui/panels/samcam_panel.py (100%) rename {gui/src => src}/aaregui/panels/sample_queue_panel.py (100%) rename {gui/src => src}/aaregui/panels/scan_settings_panel.py (100%) rename {gui/src => src}/aaregui/panels/smargon_panel.py (100%) rename {gui/src => src}/aaregui/panels/smart_rotation_panel.py (100%) rename {gui/src => src}/aaregui/panels/status_panel.py (100%) rename {gui/src => src}/aaregui/panels/tell_sample_panel.py (100%) rename {gui/src => src}/aaregui/panels/zoom_panel.py (100%) rename {gui/src/aaregui/panels => src/aaregui/scan_logic}/__init__.py (100%) rename {gui/src => src}/aaregui/scan_logic/raster_grid_manager.py (100%) rename {gui/src => src}/aaregui/scan_logic/rotation_scan_manager.py (100%) rename {gui/src => src}/aaregui/scan_logic/sample_mount_logic.py (100%) rename {gui/src/aaregui/scan_logic => src/aaregui/threads}/__init__.py (100%) rename {gui/src => src}/aaregui/threads/axis_video_thread.py (100%) rename {gui/src => src}/aaregui/threads/camera_thread.py (100%) rename {gui/src => src}/aaregui/threads/daq_worker.py (100%) rename {gui/src => src}/aaregui/threads/jfjoch_viewer.py (100%) rename {gui/src => src}/aaregui/threads/sse_client.py (100%) rename {gui/src/aaregui/threads => src/aaregui/widgets}/__init__.py (100%) rename {gui/src => src}/aaregui/widgets/button_with_payload.py (100%) rename {gui/src => src}/aaregui/widgets/camera_image.py (100%) rename {gui/src => src}/aaregui/widgets/clickable_label.py (100%) rename {gui/src => src}/aaregui/widgets/login.py (100%) rename {gui/src => src}/aaregui/widgets/message_box.py (100%) rename {gui/src => src}/aaregui/widgets/no_wheel_scroll_area.py (100%) rename {gui/src => src}/aaregui/widgets/number_line_edit.py (100%) rename {gui/src => src}/aaregui/widgets/pgroup_dialog.py (100%) rename {gui/src => src}/aaregui/widgets/raster_grid_table.py (100%) rename {gui/src => src}/aaregui/widgets/status_bar.py (100%) rename {gui/src => src}/aaregui/widgets/status_label.py (100%) rename {gui/src => src}/aaregui/widgets/title_label.py (100%) rename {gui/src => src}/aaregui/widgets/value_label.py (100%) rename {gui/src => src}/aaregui/widgets/video_image.py (100%) rename {gui/src/aaregui/widgets => src/mxlibs3}/__init__.py (100%) rename {daq/src => src}/mxlibs3/aerotech.py (100%) rename {daq/src => src}/mxlibs3/area_detector.py (100%) rename {daq/src => src}/mxlibs3/enum_pv.py (100%) rename {daq/src => src}/mxlibs3/experimental_hutch_shutter.py (100%) rename {daq/src => src}/mxlibs3/filter_transmission.py (100%) rename {daq/src => src}/mxlibs3/fluorimeter.py (100%) rename {daq/src => src}/mxlibs3/jfjoch.py (100%) rename {daq/src => src}/mxlibs3/mx_lib.py (100%) rename {daq/src => src}/mxlibs3/my_motor.py (100%) rename {daq/src => src}/mxlibs3/non_standard.py (100%) rename {daq/src => src}/mxlibs3/pshell_client.py (100%) rename {daq/src => src}/mxlibs3/smargon.py (100%) rename {daq/src => src}/mxlibs3/tell_client.py (100%) rename {daq/src => src}/mxlibs3/workflow_tools.py (100%) delete mode 100644 update_version.sh diff --git a/.gitea/workflows/action.yaml b/.gitea/workflows/action.yaml index 0873f206..f4afb563 100644 --- a/.gitea/workflows/action.yaml +++ b/.gitea/workflows/action.yaml @@ -1,24 +1,17 @@ name: Build and Publish + on: push: tags: - '*' branches: - master - - deploy - - 'feature/**' - - gitea-pages pull_request: branches: - master - - deploy pull_request_target: types: [closed] -env: - DEPLOY_BRANCH: gitea-pages - PREVIEWS_DIR: previews - jobs: build: runs-on: ubuntu-latest @@ -35,24 +28,8 @@ jobs: - name: Build the common wheel run: | - source venv/bin/activate - cd common/ - python -m build - mv dist/* ../dist - - - name: Build the GUI wheel - run: | - source venv/bin/activate - cd gui/ - python -m build - mv dist/* ../dist - - - name: Build the DAQ wheel - run: | - source venv/bin/activate - cd daq/ - python -m build - mv dist/* ../dist + source venv/bin/activate + python -m build - name: Upload Package to Gitea PyPI if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, 'build and publish') @@ -63,146 +40,3 @@ jobs: source venv/bin/activate twine upload --repository-url https://gitea.psi.ch/api/packages/mx/pypi \ dist/* - - docs: - name: Build and Deploy Docs - runs-on: ubuntu-latest - needs: build - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 # needed for pushing branches/tags - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' - - - name: Build Sphinx HTML - working-directory: daq/docs - run: | - # ensure on master - git fetch origin master:master || true - git checkout master || true - - # create venv one level up and activate it - python3 -m venv ../venv - source ../venv/bin/activate - - # ensure pip and Sphinx are installed in this venv - pip install --upgrade pip - pip install "Sphinx==8.2.3" - pip install myst-parser - pip install sphinx_immaterial - pip install linkify-it-py - - if [ -f requirements.txt ]; then - pip install -r requirements.txt - elif [ -f ../docs/requirements.txt ]; then - pip install -r ../docs/requirements.txt - else - # fallback to known packages if requirements file is not present - pip install "Sphinx==8.2.3" myst-parser sphinx_immaterial linkify-it-py - fi - - - # install project editable without deps (avoid private packages) - pip install -e ../ --no-deps - - # prefer the sphinx-apidoc CLI if available; otherwise try module fallback - if command -v sphinx-apidoc > /dev/null 2>&1; then - sphinx-apidoc -o modules/ ../src --separate --module-first --force --remove-old - else - # module fallback: some Sphinx installs expose the module at sphinx.ext.apidoc - python -m sphinx.ext.apidoc -o modules/ ../src --separate --module-first --force --remove-old - fi - - - # Build HTML (source is '.' because working-directory is docs) - # Run sphinx-build and capture exit code and full output to help debugging if it fails. - sphinx-build -b html . _build/html || { - echo "=== Sphinx build failed with exit $?: showing build output and tree ===" - echo "Contents of docs/ after build attempt:" - ls -la - echo "Contents of daq/docs/_build (if any):" - ls -la _build || true - # If sphinx produced a build log file, print it - if [ -f sphinx-build.log ]; then - echo "---- sphinx-build.log ----" - cat sphinx-build.log - fi - # Exit with non-zero to fail the job (avoid deploying empty site) - exit 1 - } - - # Sanity check: ensure HTML output exists before continuing to deploy - if [ ! -d _build/html ] || [ -z "$(ls -A _build/html)" ]; then - echo "ERROR: daq/docs/_build/html does not exist or is empty after successful sphinx-build." - ls -la _build || true - exit 1 - fi - - - name: Deploy to gitea-pages branch (Gitea) - env: - GIT_USER: "Martin Appleby (Gitea)" - GIT_EMAIL: "martin.appleby@psi.ch" - DEPLOY_TOKEN: ${{ secrets.DOCS_DEPLOY_TOKEN }} - run: | - set -e - git config --global user.name "$GIT_USER" - git config --global user.email "$GIT_EMAIL" - - # Deploy strategy: create/update branch gitea-pages and replace its contents - # with the generated daq/docs/_build/html. This keeps only the documentation - # on the gitea-pages branch. - # Confirm build output exists (relative to repository root) - BUILD_DIR="daq/docs/_build/html" - echo "Checking build output at: $BUILD_DIR" - if [ ! -d "$BUILD_DIR" ] || [ -z "$(ls -A "$BUILD_DIR")" ]; then - echo "ERROR: $BUILD_DIR does not exist or is empty" - echo "Listing docs/:" - ls -la docs || true - echo "Listing daq/docs/_build:" - ls -la daq/docs/_build || true - exit 1 - fi - # Work in a temporary clone to avoid touching the runner workspace - TMPDIR=$(mktemp -d) - REPO_URL="https://$DEPLOY_TOKEN@gitea.psi.ch/${{ github.repository }}" - git clone "$REPO_URL" "$TMPDIR" - cd "$TMPDIR" - - # Create or switch to orphan branch gitea-pages - if git rev-parse --verify --quiet gitea-pages >/dev/null; then - git checkout gitea-pages - # Make sure working tree matches branch (hard reset) - git fetch --prune origin gitea-pages || true - git reset --hard origin/gitea-pages || git reset --hard - else - git checkout --orphan gitea-pages - fi - # Remove all files tracked in the branch (leave .git) - git rm -rf . || true - # Also remove untracked files to ensure clean branch state - git clean -fdx || true - - # Copy built HTML into the clone root - echo "Copying built HTML into branch root..." - (cd "${GITHUB_WORKSPACE}/${BUILD_DIR}" && tar -cf - .) | tar -xf - -C "$TMPDIR" - - # Ensure index.html exists in destination as sanity check - if [ ! -f "$TMPDIR/index.html" ] && [ ! -f "$TMPDIR/index.htm" ]; then - # If site root index is not present, try to check subfolder - echo "Warning: no index.html found at branch root after copy. Listing files:" - ls -la "$TMPDIR" || true - fi - - git add --all - if git diff --quiet --cached; then - echo "No changes to deploy" - exit 0 - fi - COMMIT_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" - git commit -m "docs: (${COMMIT_DATE}) | auto-update documentation from ${GITHUB_SHA}" - git push --force-with-lease origin gitea-pages diff --git a/daq/docs/CHANGELOG.md b/CHANGELOG.md similarity index 94% rename from daq/docs/CHANGELOG.md rename to CHANGELOG.md index 752cc5d4..d026006d 100644 --- a/daq/docs/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog -## 0.2.70 +## 0.3.0 +- Merge three repos into one, remove Ultralytics as dependency ### 0.2.69 - check beamline state before running raster, rotation and automation diff --git a/daq/docs/README.md b/README.md similarity index 100% rename from daq/docs/README.md rename to README.md diff --git a/common/pyproject.toml b/common/pyproject.toml deleted file mode 100644 index 65184d7e..00000000 --- a/common/pyproject.toml +++ /dev/null @@ -1,25 +0,0 @@ -[project] -name = "aaredaqlib" -version = "0.2.69" -description = "Libraries shared between AareDAQ and AareGUI" -readme = "README.md" -requires-python = ">=3.11" -dependencies = [ - "pydantic==2.11.4", - "numpy==2.2.5", - "jfjoch_client==1.0.0rc122", -] - -[lint] -ignore = ["F401", "F541", "W503", "W504"] - -[tool.uv.sources] -aaredb = { index = "psi"} - -[[tool.uv.index]] -name = "psi" -url = "https://gitea.psi.ch/api/packages/mx/pypi/simple" - -[build-system] -requires = ["setuptools>=75.6.0"] -build-backend = "setuptools.build_meta" diff --git a/daq/docs/conf.py b/daq/docs/conf.py deleted file mode 100644 index 4c0447ba..00000000 --- a/daq/docs/conf.py +++ /dev/null @@ -1,149 +0,0 @@ -# Configuration file for the Sphinx documentation builder. -# -# For the full list of built-in configuration values, see the documentation: -# https://www.sphinx-doc.org/en/master/usage/configuration.html - -# -- Project information ----------------------------------------------------- -# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information -import os -import sys - -# Add project root to Python path so autodoc can import modules -sys.path.insert(0, os.path.abspath('..')) -sys.path.insert(0, os.path.abspath('../src')) # <-- ensure 'src' is on path -sys.path.insert(0, os.path.abspath('../src/aaredaq')) -sys.path.insert(0, os.path.abspath('../src/mxlibs3')) -sys.path.insert(0, os.path.abspath('../../common')) -sys.path.insert(0, os.path.abspath('../../common/src')) -sys.path.insert(0, os.path.abspath('../../common/src/aaredaqlib')) -sys.path.insert(0, os.path.abspath('../../gui')) -sys.path.insert(0, os.path.abspath('../../gui/src')) -sys.path.insert(0, os.path.abspath('../../gui/src/aaregui')) - -project = 'AareDAQ' -copyright = '2025, Paul Scherrer Institute' -author = 'M. Vears Appleby' -release = '0.2.70' -master_doc = 'index' -root_doc = 'index' -# -- General configuration --------------------------------------------------- -# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration - -autodoc_mock_imports = [ - 'cv2', - 'redis', - 'jfjoch_client', - 'epics', - 'sseclient', - 'jwt', - 'aaredb', - 'aareDBclient', - 'numpy', - 'requests', - 'PyYAML', - 'loguru', - 'utility_tools', - 'extract_results', - 'testxds', - 'db_slurm_handler', - 'websocket', - 'dateutil', - 'PySide6', - 'scipy', - 'redis_lock', - 'fastapi', - 'uvicorn', - 'pydantic' -] - -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] - -extensions = [ - 'myst_parser', - 'sphinx_immaterial', - 'sphinx.ext.autodoc', # Add this - 'sphinx.ext.viewcode', # Optional: source code links - 'sphinx.ext.napoleon' # Optional: Google/NumPy docstring support -] - - -templates_path = ['_templates'] -exclude_patterns = [] -myst_enable_extensions = ['linkify', 'smartquotes'] - - -myst_heading_anchor = 3 - -# -- Options for HTML output ------------------------------------------------- -# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output - -html_theme = 'sphinx_immaterial' -# html_static_path = ['../broker/redoc-static.html'] -#html_theme_options = { -# 'sidebar_width': '300px', -# 'page_width': 'auto' -#} - -# html_theme_options = { -# 'repo_url': 'https://gitea.psi.ch/mx/aaredaq', -# 'repo_name': 'AareDaq', -# 'nav_title': 'PSI AareDaq', -# # 'html_minify': True, -# # 'css_minify': True, -# 'globaltoc_depth': 2, -# # 'repo_type': 'gitlab', -# 'color_primary': 'indigo', -# 'color_accent': 'lime', -# # 'logo_icon': '' -# } - -# html_logo = 'jfjoch.png' -# html_favicon = 'jfjoch.png' -html_theme_options = { - "icon": { - "repo": "fontawesome/brands/github", # or gitlab/gitea icon - }, - "site_url": "https://gitea.psi.ch/mx/aaredaq", - "repo_url": "https://gitea.psi.ch/mx/aaredaq", - "repo_name": "AareDAQ", - "palette": [ - { - "media": "(prefers-color-scheme: light)", - "scheme": "default", - "primary": "indigo", - "accent": "lime", - "toggle": { - "icon": "material/lightbulb-outline", - "name": "Switch to dark mode", - }, - }, - { - "media": "(prefers-color-scheme: dark)", - "scheme": "slate", - "primary": "indigo", - "accent": "lime", - "toggle": { - "icon": "material/lightbulb", - "name": "Switch to light mode", - }, - }, - ], - "features": [ - "navigation.expand", - "navigation.sections", - "navigation.top", - "search.share", - "toc.follow", - ], - "globaltoc_collapse": False, -} -html_theme_options["google_fonts"] = [] -html_sidebars = { - "**": ["logo-text.html", "globaltoc.html", "searchbox.html"] -} - - -html_show_sourcelink = False - -# language = "Python" - diff --git a/daq/docs/index.rst b/daq/docs/index.rst deleted file mode 100644 index 40f6181d..00000000 --- a/daq/docs/index.rst +++ /dev/null @@ -1,30 +0,0 @@ -.. AareProc documentation master file, created by - sphinx-quickstart on Sun Dec 21 14:22:05 2025. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to AareDAQ's documentation! -==================================== - -.. toctree:: - :maxdepth: 2 - :caption: Contents: - :glob: - - README - CHANGELOG - -.. toctree:: - :maxdepth: 4 - :caption: OpenAPI Python client - - modules/src.aaredaq - modules/src.mxlibs3 - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` - diff --git a/daq/docs/requirements.txt b/daq/docs/requirements.txt deleted file mode 100644 index 86a4ba7f..00000000 --- a/daq/docs/requirements.txt +++ /dev/null @@ -1,37 +0,0 @@ -alabaster==1.0.0 -babel==2.16.0 -beautifulsoup4==4.12.3 -certifi==2024.8.30 -charset-normalizer==3.4.0 -css-html-js-minify==2.5.5 -docutils==0.21.2 -idna==3.10 -imagesize==1.4.1 -Jinja2==3.1.4 -linkify-it-py==2.0.3 -lxml==5.3.0 -markdown-it-py==3.0.0 -MarkupSafe==3.0.2 -mdit-py-plugins==0.4.2 -mdurl==0.1.2 -myst-parser==4.0.0 -packaging==24.2 -Pygments==2.18.0 -python-slugify==8.0.4 -PyYAML==6.0.2 -requests==2.32.3 -snowballstemmer==2.2.0 -soupsieve==2.6 -Sphinx==8.1.3 -sphinx-material==0.0.36 -sphinxcontrib-applehelp==2.0.0 -sphinxcontrib-devhelp==2.0.0 -sphinxcontrib-htmlhelp==2.1.0 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==2.0.0 -sphinxcontrib-serializinghtml==2.0.0 -text-unidecode==1.3 -uc-micro-py==1.0.3 -Unidecode==1.3.8 -urllib3==2.2.3 -sphinx_immaterial==0.13.8 diff --git a/gui/pyproject.toml b/gui/pyproject.toml deleted file mode 100644 index 86896082..00000000 --- a/gui/pyproject.toml +++ /dev/null @@ -1,28 +0,0 @@ -[project] -name = "aaregui" -version = "0.2.69" -description = "Beamline control GUI" -readme = "README.md" -requires-python = ">=3.11" -dependencies = [ - "pyjwt==2.10.1", - "pyzmq==26.4.0", - "opencv-python-headless==4.11.0.86", - "PySide6==6.9.0", - "aaredaqlib==0.2.69" -] - -[lint] -ignore = ["F401", "F541", "W503", "W504"] - -[build-system] -requires = ["setuptools>=75.6.0"] -build-backend = "setuptools.build_meta" - -[tool.uv.sources] -aaredb = { index = "psi"} - -[[tool.uv.index]] -name = "psi" -url = "https://gitea.psi.ch/api/packages/mx/pypi/simple" - diff --git a/daq/pyproject.toml b/pyproject.toml similarity index 74% rename from daq/pyproject.toml rename to pyproject.toml index d87c7a2e..e17f11cd 100644 --- a/daq/pyproject.toml +++ b/pyproject.toml @@ -1,15 +1,21 @@ [project] name = "aaredaq" -version = "0.2.69" -description = "AareDAQ data acquisition server" +version = "0.3.0" +description = "AareDAQ (with GUI)" readme = "README.md" requires-python = ">=3.11" dependencies = [ + "pydantic==2.11.4", + "numpy==2.2.5", + "jfjoch_client==1.0.0rc122", + "pyJWT==2.10.1", + "pyzmq==26.4.0", + "opencv-python-headless==4.11.0.86", + "PySide6==6.9.0", "requests==2.32.4", "pyepics==3.5.8", "redis==6.2.0", "python-redis-lock==4.0.0", - "PyJWT==2.10.1", "fastapi==0.115.13", "uvicorn==0.34.2", "aaredb==0.1.1a33", @@ -17,7 +23,6 @@ dependencies = [ "python_multipart==0.0.20", "websocket-client==1.8.0", "sseclient-py==1.8.0", - "aaredaqlib==0.2.69" ] [lint] diff --git a/scripts/knife_edge_scan.ipynb b/scripts/knife_edge_scan.ipynb index a05a73d7..f5a35345 100644 --- a/scripts/knife_edge_scan.ipynb +++ b/scripts/knife_edge_scan.ipynb @@ -16,7 +16,7 @@ "cell_type": "code", "source": [ "from aaredaq.devices import BeamlineDevices\n", - "from aaredaqlib.beamline import MXBeamline" + "from aaredaqlib import MXBeamline" ], "id": "d2efa08de2dbd46b", "outputs": [], diff --git a/common/src/aaredaqlib/__init__.py b/src/aaredaq/__init__.py similarity index 100% rename from common/src/aaredaqlib/__init__.py rename to src/aaredaq/__init__.py diff --git a/daq/src/aaredaq/aaredb.py b/src/aaredaq/aaredb.py similarity index 100% rename from daq/src/aaredaq/aaredb.py rename to src/aaredaq/aaredb.py diff --git a/daq/src/aaredaq/auth.py b/src/aaredaq/auth.py similarity index 100% rename from daq/src/aaredaq/auth.py rename to src/aaredaq/auth.py diff --git a/daq/src/aaredaq/autofocus.py b/src/aaredaq/autofocus.py similarity index 100% rename from daq/src/aaredaq/autofocus.py rename to src/aaredaq/autofocus.py diff --git a/daq/src/aaredaq/beamcenterfit.py b/src/aaredaq/beamcenterfit.py similarity index 100% rename from daq/src/aaredaq/beamcenterfit.py rename to src/aaredaq/beamcenterfit.py diff --git a/daq/src/aaredaq/config.py b/src/aaredaq/config.py similarity index 100% rename from daq/src/aaredaq/config.py rename to src/aaredaq/config.py diff --git a/daq/src/aaredaq/daq.py b/src/aaredaq/daq.py similarity index 99% rename from daq/src/aaredaq/daq.py rename to src/aaredaq/daq.py index f3667a45..f9d95831 100644 --- a/daq/src/aaredaq/daq.py +++ b/src/aaredaq/daq.py @@ -1,5 +1,4 @@ import copy -import json import secrets import time from datetime import datetime @@ -22,7 +21,7 @@ from aaredaqlib.beamline import MXBeamline from aaredaqlib.coordinate import Coordinate, SmargonCoordinate from aaredaqlib.diffraction_geometry import DiffractionGeometry from aaredaqlib.find_xtal import raster_centre_of_mass, create_quality_filtered_array, identify_crystal_raster, \ - get_result_list_from_com, get_best_b_factor, get_best_res, get_xtal_size, has_sufficient_low_res_spots + get_result_list_from_com, get_best_b_factor, get_best_res, get_xtal_size from aaredaqlib.logger_config import setup_logger from aaredaqlib.models import ( SampleShortInfo, diff --git a/daq/src/aaredaq/devices.py b/src/aaredaq/devices.py similarity index 100% rename from daq/src/aaredaq/devices.py rename to src/aaredaq/devices.py diff --git a/daq/src/aaredaq/mlbox.py b/src/aaredaq/mlbox.py similarity index 100% rename from daq/src/aaredaq/mlbox.py rename to src/aaredaq/mlbox.py diff --git a/daq/src/aaredaq/server.py b/src/aaredaq/server.py similarity index 99% rename from daq/src/aaredaq/server.py rename to src/aaredaq/server.py index 283317d4..20d7fa62 100644 --- a/daq/src/aaredaq/server.py +++ b/src/aaredaq/server.py @@ -1,7 +1,7 @@ import asyncio import io import os, time -from typing import Tuple, AsyncGenerator +from typing import AsyncGenerator import json import cv2 import urllib3 @@ -20,7 +20,6 @@ from fastapi import HTTPException from fastapi import status as api_status from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from starlette.responses import StreamingResponse -from urllib3.exceptions import InsecureRequestWarning from aaredaq import auth from aaredaqlib.beamline import mx_beamline diff --git a/daq/src/aaredaq/spreadsheetupdater.py b/src/aaredaq/spreadsheetupdater.py similarity index 100% rename from daq/src/aaredaq/spreadsheetupdater.py rename to src/aaredaq/spreadsheetupdater.py diff --git a/daq/src/aaredaq/tellupdater.py b/src/aaredaq/tellupdater.py similarity index 100% rename from daq/src/aaredaq/tellupdater.py rename to src/aaredaq/tellupdater.py diff --git a/daq/src/aaredaq/workflows.py b/src/aaredaq/workflows.py similarity index 100% rename from daq/src/aaredaq/workflows.py rename to src/aaredaq/workflows.py diff --git a/daq/src/aaredaq/__init__.py b/src/aaredaqlib/__init__.py similarity index 100% rename from daq/src/aaredaq/__init__.py rename to src/aaredaqlib/__init__.py diff --git a/common/src/aaredaqlib/beamline.py b/src/aaredaqlib/beamline.py similarity index 100% rename from common/src/aaredaqlib/beamline.py rename to src/aaredaqlib/beamline.py diff --git a/common/src/aaredaqlib/coordinate.py b/src/aaredaqlib/coordinate.py similarity index 100% rename from common/src/aaredaqlib/coordinate.py rename to src/aaredaqlib/coordinate.py diff --git a/common/src/aaredaqlib/diffraction_geometry.py b/src/aaredaqlib/diffraction_geometry.py similarity index 100% rename from common/src/aaredaqlib/diffraction_geometry.py rename to src/aaredaqlib/diffraction_geometry.py diff --git a/common/src/aaredaqlib/face_detection.py b/src/aaredaqlib/face_detection.py similarity index 100% rename from common/src/aaredaqlib/face_detection.py rename to src/aaredaqlib/face_detection.py diff --git a/common/src/aaredaqlib/find_xtal.py b/src/aaredaqlib/find_xtal.py similarity index 100% rename from common/src/aaredaqlib/find_xtal.py rename to src/aaredaqlib/find_xtal.py diff --git a/common/src/aaredaqlib/logger_config.py b/src/aaredaqlib/logger_config.py similarity index 100% rename from common/src/aaredaqlib/logger_config.py rename to src/aaredaqlib/logger_config.py diff --git a/common/src/aaredaqlib/models.py b/src/aaredaqlib/models.py similarity index 100% rename from common/src/aaredaqlib/models.py rename to src/aaredaqlib/models.py diff --git a/common/src/aaredaqlib/raster_grid.py b/src/aaredaqlib/raster_grid.py similarity index 100% rename from common/src/aaredaqlib/raster_grid.py rename to src/aaredaqlib/raster_grid.py diff --git a/common/src/aaredaqlib/rotation_scan.py b/src/aaredaqlib/rotation_scan.py similarity index 100% rename from common/src/aaredaqlib/rotation_scan.py rename to src/aaredaqlib/rotation_scan.py diff --git a/common/src/aaredaqlib/sample_geometry.py b/src/aaredaqlib/sample_geometry.py similarity index 100% rename from common/src/aaredaqlib/sample_geometry.py rename to src/aaredaqlib/sample_geometry.py diff --git a/daq/src/mxlibs3/__init__.py b/src/aaregui/__init__.py similarity index 100% rename from daq/src/mxlibs3/__init__.py rename to src/aaregui/__init__.py diff --git a/gui/src/aaregui/auth.py b/src/aaregui/auth.py similarity index 100% rename from gui/src/aaregui/auth.py rename to src/aaregui/auth.py diff --git a/gui/src/aaregui/gui.py b/src/aaregui/gui.py similarity index 100% rename from gui/src/aaregui/gui.py rename to src/aaregui/gui.py diff --git a/gui/src/aaregui/main_window.py b/src/aaregui/main_window.py similarity index 100% rename from gui/src/aaregui/main_window.py rename to src/aaregui/main_window.py diff --git a/gui/src/aaregui/__init__.py b/src/aaregui/models/__init__.py similarity index 100% rename from gui/src/aaregui/__init__.py rename to src/aaregui/models/__init__.py diff --git a/gui/src/aaregui/models/bookmark.py b/src/aaregui/models/bookmark.py similarity index 100% rename from gui/src/aaregui/models/bookmark.py rename to src/aaregui/models/bookmark.py diff --git a/gui/src/aaregui/models/sample_queue_model.py b/src/aaregui/models/sample_queue_model.py similarity index 100% rename from gui/src/aaregui/models/sample_queue_model.py rename to src/aaregui/models/sample_queue_model.py diff --git a/gui/src/aaregui/models/user_sample_model.py b/src/aaregui/models/user_sample_model.py similarity index 100% rename from gui/src/aaregui/models/user_sample_model.py rename to src/aaregui/models/user_sample_model.py diff --git a/gui/src/aaregui/panels/LogPanel.py b/src/aaregui/panels/LogPanel.py similarity index 100% rename from gui/src/aaregui/panels/LogPanel.py rename to src/aaregui/panels/LogPanel.py diff --git a/gui/src/aaregui/models/__init__.py b/src/aaregui/panels/__init__.py similarity index 100% rename from gui/src/aaregui/models/__init__.py rename to src/aaregui/panels/__init__.py diff --git a/gui/src/aaregui/panels/abr_tweak_panel.py b/src/aaregui/panels/abr_tweak_panel.py similarity index 100% rename from gui/src/aaregui/panels/abr_tweak_panel.py rename to src/aaregui/panels/abr_tweak_panel.py diff --git a/gui/src/aaregui/panels/beam_center_panel.py b/src/aaregui/panels/beam_center_panel.py similarity index 100% rename from gui/src/aaregui/panels/beam_center_panel.py rename to src/aaregui/panels/beam_center_panel.py diff --git a/gui/src/aaregui/panels/beam_mark_panel.py b/src/aaregui/panels/beam_mark_panel.py similarity index 100% rename from gui/src/aaregui/panels/beam_mark_panel.py rename to src/aaregui/panels/beam_mark_panel.py diff --git a/gui/src/aaregui/panels/beam_size_panel.py b/src/aaregui/panels/beam_size_panel.py similarity index 100% rename from gui/src/aaregui/panels/beam_size_panel.py rename to src/aaregui/panels/beam_size_panel.py diff --git a/gui/src/aaregui/panels/beamline_controls.py b/src/aaregui/panels/beamline_controls.py similarity index 100% rename from gui/src/aaregui/panels/beamline_controls.py rename to src/aaregui/panels/beamline_controls.py diff --git a/gui/src/aaregui/panels/beamline_state_panel.py b/src/aaregui/panels/beamline_state_panel.py similarity index 100% rename from gui/src/aaregui/panels/beamline_state_panel.py rename to src/aaregui/panels/beamline_state_panel.py diff --git a/gui/src/aaregui/panels/data_collection_settings.py b/src/aaregui/panels/data_collection_settings.py similarity index 100% rename from gui/src/aaregui/panels/data_collection_settings.py rename to src/aaregui/panels/data_collection_settings.py diff --git a/gui/src/aaregui/panels/face_detection_panel.py b/src/aaregui/panels/face_detection_panel.py similarity index 100% rename from gui/src/aaregui/panels/face_detection_panel.py rename to src/aaregui/panels/face_detection_panel.py diff --git a/gui/src/aaregui/panels/file_path_panel.py b/src/aaregui/panels/file_path_panel.py similarity index 100% rename from gui/src/aaregui/panels/file_path_panel.py rename to src/aaregui/panels/file_path_panel.py diff --git a/gui/src/aaregui/panels/fluorescence_data_collection.py b/src/aaregui/panels/fluorescence_data_collection.py similarity index 100% rename from gui/src/aaregui/panels/fluorescence_data_collection.py rename to src/aaregui/panels/fluorescence_data_collection.py diff --git a/gui/src/aaregui/panels/fluorescence_panel.py b/src/aaregui/panels/fluorescence_panel.py similarity index 100% rename from gui/src/aaregui/panels/fluorescence_panel.py rename to src/aaregui/panels/fluorescence_panel.py diff --git a/gui/src/aaregui/panels/illumination_panel.py b/src/aaregui/panels/illumination_panel.py similarity index 100% rename from gui/src/aaregui/panels/illumination_panel.py rename to src/aaregui/panels/illumination_panel.py diff --git a/gui/src/aaregui/panels/loop_centering_panel.py b/src/aaregui/panels/loop_centering_panel.py similarity index 100% rename from gui/src/aaregui/panels/loop_centering_panel.py rename to src/aaregui/panels/loop_centering_panel.py diff --git a/gui/src/aaregui/panels/manual_sample_panel.py b/src/aaregui/panels/manual_sample_panel.py similarity index 100% rename from gui/src/aaregui/panels/manual_sample_panel.py rename to src/aaregui/panels/manual_sample_panel.py diff --git a/gui/src/aaregui/panels/omega_panel.py b/src/aaregui/panels/omega_panel.py similarity index 100% rename from gui/src/aaregui/panels/omega_panel.py rename to src/aaregui/panels/omega_panel.py diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/src/aaregui/panels/raster_data_collection.py similarity index 100% rename from gui/src/aaregui/panels/raster_data_collection.py rename to src/aaregui/panels/raster_data_collection.py diff --git a/gui/src/aaregui/panels/reference_tools_panel.py b/src/aaregui/panels/reference_tools_panel.py similarity index 100% rename from gui/src/aaregui/panels/reference_tools_panel.py rename to src/aaregui/panels/reference_tools_panel.py diff --git a/gui/src/aaregui/panels/rotation_data_collection.py b/src/aaregui/panels/rotation_data_collection.py similarity index 100% rename from gui/src/aaregui/panels/rotation_data_collection.py rename to src/aaregui/panels/rotation_data_collection.py diff --git a/gui/src/aaregui/panels/samcam_panel.py b/src/aaregui/panels/samcam_panel.py similarity index 100% rename from gui/src/aaregui/panels/samcam_panel.py rename to src/aaregui/panels/samcam_panel.py diff --git a/gui/src/aaregui/panels/sample_queue_panel.py b/src/aaregui/panels/sample_queue_panel.py similarity index 100% rename from gui/src/aaregui/panels/sample_queue_panel.py rename to src/aaregui/panels/sample_queue_panel.py diff --git a/gui/src/aaregui/panels/scan_settings_panel.py b/src/aaregui/panels/scan_settings_panel.py similarity index 100% rename from gui/src/aaregui/panels/scan_settings_panel.py rename to src/aaregui/panels/scan_settings_panel.py diff --git a/gui/src/aaregui/panels/smargon_panel.py b/src/aaregui/panels/smargon_panel.py similarity index 100% rename from gui/src/aaregui/panels/smargon_panel.py rename to src/aaregui/panels/smargon_panel.py diff --git a/gui/src/aaregui/panels/smart_rotation_panel.py b/src/aaregui/panels/smart_rotation_panel.py similarity index 100% rename from gui/src/aaregui/panels/smart_rotation_panel.py rename to src/aaregui/panels/smart_rotation_panel.py diff --git a/gui/src/aaregui/panels/status_panel.py b/src/aaregui/panels/status_panel.py similarity index 100% rename from gui/src/aaregui/panels/status_panel.py rename to src/aaregui/panels/status_panel.py diff --git a/gui/src/aaregui/panels/tell_sample_panel.py b/src/aaregui/panels/tell_sample_panel.py similarity index 100% rename from gui/src/aaregui/panels/tell_sample_panel.py rename to src/aaregui/panels/tell_sample_panel.py diff --git a/gui/src/aaregui/panels/zoom_panel.py b/src/aaregui/panels/zoom_panel.py similarity index 100% rename from gui/src/aaregui/panels/zoom_panel.py rename to src/aaregui/panels/zoom_panel.py diff --git a/gui/src/aaregui/panels/__init__.py b/src/aaregui/scan_logic/__init__.py similarity index 100% rename from gui/src/aaregui/panels/__init__.py rename to src/aaregui/scan_logic/__init__.py diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/src/aaregui/scan_logic/raster_grid_manager.py similarity index 100% rename from gui/src/aaregui/scan_logic/raster_grid_manager.py rename to src/aaregui/scan_logic/raster_grid_manager.py diff --git a/gui/src/aaregui/scan_logic/rotation_scan_manager.py b/src/aaregui/scan_logic/rotation_scan_manager.py similarity index 100% rename from gui/src/aaregui/scan_logic/rotation_scan_manager.py rename to src/aaregui/scan_logic/rotation_scan_manager.py diff --git a/gui/src/aaregui/scan_logic/sample_mount_logic.py b/src/aaregui/scan_logic/sample_mount_logic.py similarity index 100% rename from gui/src/aaregui/scan_logic/sample_mount_logic.py rename to src/aaregui/scan_logic/sample_mount_logic.py diff --git a/gui/src/aaregui/scan_logic/__init__.py b/src/aaregui/threads/__init__.py similarity index 100% rename from gui/src/aaregui/scan_logic/__init__.py rename to src/aaregui/threads/__init__.py diff --git a/gui/src/aaregui/threads/axis_video_thread.py b/src/aaregui/threads/axis_video_thread.py similarity index 100% rename from gui/src/aaregui/threads/axis_video_thread.py rename to src/aaregui/threads/axis_video_thread.py diff --git a/gui/src/aaregui/threads/camera_thread.py b/src/aaregui/threads/camera_thread.py similarity index 100% rename from gui/src/aaregui/threads/camera_thread.py rename to src/aaregui/threads/camera_thread.py diff --git a/gui/src/aaregui/threads/daq_worker.py b/src/aaregui/threads/daq_worker.py similarity index 100% rename from gui/src/aaregui/threads/daq_worker.py rename to src/aaregui/threads/daq_worker.py diff --git a/gui/src/aaregui/threads/jfjoch_viewer.py b/src/aaregui/threads/jfjoch_viewer.py similarity index 100% rename from gui/src/aaregui/threads/jfjoch_viewer.py rename to src/aaregui/threads/jfjoch_viewer.py diff --git a/gui/src/aaregui/threads/sse_client.py b/src/aaregui/threads/sse_client.py similarity index 100% rename from gui/src/aaregui/threads/sse_client.py rename to src/aaregui/threads/sse_client.py diff --git a/gui/src/aaregui/threads/__init__.py b/src/aaregui/widgets/__init__.py similarity index 100% rename from gui/src/aaregui/threads/__init__.py rename to src/aaregui/widgets/__init__.py diff --git a/gui/src/aaregui/widgets/button_with_payload.py b/src/aaregui/widgets/button_with_payload.py similarity index 100% rename from gui/src/aaregui/widgets/button_with_payload.py rename to src/aaregui/widgets/button_with_payload.py diff --git a/gui/src/aaregui/widgets/camera_image.py b/src/aaregui/widgets/camera_image.py similarity index 100% rename from gui/src/aaregui/widgets/camera_image.py rename to src/aaregui/widgets/camera_image.py diff --git a/gui/src/aaregui/widgets/clickable_label.py b/src/aaregui/widgets/clickable_label.py similarity index 100% rename from gui/src/aaregui/widgets/clickable_label.py rename to src/aaregui/widgets/clickable_label.py diff --git a/gui/src/aaregui/widgets/login.py b/src/aaregui/widgets/login.py similarity index 100% rename from gui/src/aaregui/widgets/login.py rename to src/aaregui/widgets/login.py diff --git a/gui/src/aaregui/widgets/message_box.py b/src/aaregui/widgets/message_box.py similarity index 100% rename from gui/src/aaregui/widgets/message_box.py rename to src/aaregui/widgets/message_box.py diff --git a/gui/src/aaregui/widgets/no_wheel_scroll_area.py b/src/aaregui/widgets/no_wheel_scroll_area.py similarity index 100% rename from gui/src/aaregui/widgets/no_wheel_scroll_area.py rename to src/aaregui/widgets/no_wheel_scroll_area.py diff --git a/gui/src/aaregui/widgets/number_line_edit.py b/src/aaregui/widgets/number_line_edit.py similarity index 100% rename from gui/src/aaregui/widgets/number_line_edit.py rename to src/aaregui/widgets/number_line_edit.py diff --git a/gui/src/aaregui/widgets/pgroup_dialog.py b/src/aaregui/widgets/pgroup_dialog.py similarity index 100% rename from gui/src/aaregui/widgets/pgroup_dialog.py rename to src/aaregui/widgets/pgroup_dialog.py diff --git a/gui/src/aaregui/widgets/raster_grid_table.py b/src/aaregui/widgets/raster_grid_table.py similarity index 100% rename from gui/src/aaregui/widgets/raster_grid_table.py rename to src/aaregui/widgets/raster_grid_table.py diff --git a/gui/src/aaregui/widgets/status_bar.py b/src/aaregui/widgets/status_bar.py similarity index 100% rename from gui/src/aaregui/widgets/status_bar.py rename to src/aaregui/widgets/status_bar.py diff --git a/gui/src/aaregui/widgets/status_label.py b/src/aaregui/widgets/status_label.py similarity index 100% rename from gui/src/aaregui/widgets/status_label.py rename to src/aaregui/widgets/status_label.py diff --git a/gui/src/aaregui/widgets/title_label.py b/src/aaregui/widgets/title_label.py similarity index 100% rename from gui/src/aaregui/widgets/title_label.py rename to src/aaregui/widgets/title_label.py diff --git a/gui/src/aaregui/widgets/value_label.py b/src/aaregui/widgets/value_label.py similarity index 100% rename from gui/src/aaregui/widgets/value_label.py rename to src/aaregui/widgets/value_label.py diff --git a/gui/src/aaregui/widgets/video_image.py b/src/aaregui/widgets/video_image.py similarity index 100% rename from gui/src/aaregui/widgets/video_image.py rename to src/aaregui/widgets/video_image.py diff --git a/gui/src/aaregui/widgets/__init__.py b/src/mxlibs3/__init__.py similarity index 100% rename from gui/src/aaregui/widgets/__init__.py rename to src/mxlibs3/__init__.py diff --git a/daq/src/mxlibs3/aerotech.py b/src/mxlibs3/aerotech.py similarity index 100% rename from daq/src/mxlibs3/aerotech.py rename to src/mxlibs3/aerotech.py diff --git a/daq/src/mxlibs3/area_detector.py b/src/mxlibs3/area_detector.py similarity index 100% rename from daq/src/mxlibs3/area_detector.py rename to src/mxlibs3/area_detector.py diff --git a/daq/src/mxlibs3/enum_pv.py b/src/mxlibs3/enum_pv.py similarity index 100% rename from daq/src/mxlibs3/enum_pv.py rename to src/mxlibs3/enum_pv.py diff --git a/daq/src/mxlibs3/experimental_hutch_shutter.py b/src/mxlibs3/experimental_hutch_shutter.py similarity index 100% rename from daq/src/mxlibs3/experimental_hutch_shutter.py rename to src/mxlibs3/experimental_hutch_shutter.py diff --git a/daq/src/mxlibs3/filter_transmission.py b/src/mxlibs3/filter_transmission.py similarity index 100% rename from daq/src/mxlibs3/filter_transmission.py rename to src/mxlibs3/filter_transmission.py diff --git a/daq/src/mxlibs3/fluorimeter.py b/src/mxlibs3/fluorimeter.py similarity index 100% rename from daq/src/mxlibs3/fluorimeter.py rename to src/mxlibs3/fluorimeter.py diff --git a/daq/src/mxlibs3/jfjoch.py b/src/mxlibs3/jfjoch.py similarity index 100% rename from daq/src/mxlibs3/jfjoch.py rename to src/mxlibs3/jfjoch.py diff --git a/daq/src/mxlibs3/mx_lib.py b/src/mxlibs3/mx_lib.py similarity index 100% rename from daq/src/mxlibs3/mx_lib.py rename to src/mxlibs3/mx_lib.py diff --git a/daq/src/mxlibs3/my_motor.py b/src/mxlibs3/my_motor.py similarity index 100% rename from daq/src/mxlibs3/my_motor.py rename to src/mxlibs3/my_motor.py diff --git a/daq/src/mxlibs3/non_standard.py b/src/mxlibs3/non_standard.py similarity index 100% rename from daq/src/mxlibs3/non_standard.py rename to src/mxlibs3/non_standard.py diff --git a/daq/src/mxlibs3/pshell_client.py b/src/mxlibs3/pshell_client.py similarity index 100% rename from daq/src/mxlibs3/pshell_client.py rename to src/mxlibs3/pshell_client.py diff --git a/daq/src/mxlibs3/smargon.py b/src/mxlibs3/smargon.py similarity index 100% rename from daq/src/mxlibs3/smargon.py rename to src/mxlibs3/smargon.py diff --git a/daq/src/mxlibs3/tell_client.py b/src/mxlibs3/tell_client.py similarity index 100% rename from daq/src/mxlibs3/tell_client.py rename to src/mxlibs3/tell_client.py diff --git a/daq/src/mxlibs3/workflow_tools.py b/src/mxlibs3/workflow_tools.py similarity index 100% rename from daq/src/mxlibs3/workflow_tools.py rename to src/mxlibs3/workflow_tools.py diff --git a/update_version.sh b/update_version.sh deleted file mode 100644 index ebff14ba..00000000 --- a/update_version.sh +++ /dev/null @@ -1,9 +0,0 @@ -#/bin/bash - -VERSION=$(