diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 00da88c..0000000 --- a/.flake8 +++ /dev/null @@ -1,9 +0,0 @@ -[flake8] -ignore = E501, E203, E402, W503, Q000 -# E501 & E203: Formatting handled by Black -# E402 complains about imports not being at the top -# W503 complains about splitting if across lines which conflicts with Black -# Q000 complains about using "" and not '' which conflicts with Black -exclude = - fbschemas - README.md diff --git a/.github/workflows/Lint-and-test.yml b/.github/workflows/Lint-and-test.yml new file mode 100644 index 0000000..02697cc --- /dev/null +++ b/.github/workflows/Lint-and-test.yml @@ -0,0 +1,48 @@ +# This workflow will install Python dependencies, run tests and lint with a single version of Python +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python application + +on: + workflow_call: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + call-workflow: + uses: ISISComputingGroup/reusable-workflows/.github/workflows/linters.yml@main + with: + compare-branch: origin/main + python-ver: '3.13' + runs-on: 'ubuntu-latest' + tests: + strategy: + matrix: + version: ['3.12', '3.13', '3.14'] + os: ["ubuntu-latest", "windows-latest"] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v6 + - name: Install uv and set the python version + uses: astral-sh/setup-uv@v7 + with: + python-version: ${{ matrix.runs-on }} + - name: Install dependencies + run: uv sync --all-extras --dev + - name: Test with pytest + run: uv run pytest tests + results: + if: ${{ always() }} + runs-on: ubuntu-latest + name: Final Results + needs: [tests, call-workflow] + steps: + - run: exit 1 + # see https://stackoverflow.com/a/67532120/4907315 + if: >- + ${{ + contains(needs.*.result, 'failure') + || contains(needs.*.result, 'cancelled') + }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..2d8134e --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,92 @@ +name: Publish Python distribution to PyPI +on: push +jobs: + lint-and-test: + if: github.ref_type == 'tag' + name: Run linter and tests + uses: ./.github/workflows/Lint-and-test.yml + build: + needs: lint-and-test + if: github.ref_type == 'tag' + name: build distribution + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v6 + - name: Set up Python + uses: actions/setup-python@v6 + with: + python-version: "3.13" + - name: Install pypa/build + run: >- + python3 -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Store the distribution packages + uses: actions/upload-artifact@v6 + with: + name: python-package-distributions + path: dist/ + publish-to-pypi: + name: >- + Publish Python distribution to PyPI + if: github.ref_type == 'tag' + needs: [lint-and-test, build] + runs-on: ubuntu-latest + environment: + name: release + url: https://pypi.org/p/isis-streaming-data-types + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + steps: + - name: Download all the dists + uses: actions/download-artifact@v7 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + github-release: + name: >- + Sign the Python distribution with Sigstore + and upload them to GitHub Release + needs: [lint-and-test, build, publish-to-pypi] + runs-on: ubuntu-latest + + permissions: + contents: write # IMPORTANT: mandatory for making GitHub Releases + id-token: write # IMPORTANT: mandatory for sigstore + + steps: + - name: Download all the dists + uses: actions/download-artifact@v7 + with: + name: python-package-distributions + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v3.2.0 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release create + '${{ github.ref_name }}' + --repo '${{ github.repository }}' + --notes "" + - name: Upload artifact signatures to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + # Upload to GitHub Release using the `gh` CLI. + # `dist/` contains the built packages, and the + # sigstore-produced signatures and certificates. + run: >- + gh release upload + '${{ github.ref_name }}' dist/** + --repo '${{ github.repository }}' diff --git a/.gitignore b/.gitignore index 7ba83bc..a8b9804 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,5 @@ dmypy.json # VSCode .vscode + +src/streaming_data_types/_version.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index d9ad7bc..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,23 +0,0 @@ -repos: -- repo: local - hooks: - - id: black - name: black - entry: black - language: system - types_or: [python, pyi] - require_serial: true - - id: flake8 - name: flake8 - entry: flake8 - language: system - types: [python] - require_serial: true - - id: isort - name: isort - entry: isort - args: ["--profile", "black"] - language: system - types_or: [cython, pyi, python] - require_serial: true - diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 5dd9038..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -include LICENSE -include requirements*.* -include Makefile -include README.md diff --git a/Makefile b/Makefile deleted file mode 100644 index ab4c425..0000000 --- a/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -init: - pip install -r requirements.txt - -test: - pytest tests diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..6079d6b --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,103 @@ +[build-system] +requires = ["setuptools", "setuptools_scm>=8"] +build-backend = "setuptools.build_meta" + + +[project] +name = "isis_streaming_data_types" +dynamic = ["version"] +description = "Python utilities for handling ISIS streamed data" +readme = "README.md" +requires-python = ">=3.12" +license-files = ["LICENSE"] + +authors = [ + {name = "ISIS Experiment Controls", email = "ISISExperimentControls@stfc.ac.uk" } +] +maintainers = [ + {name = "ISIS Experiment Controls", email = "ISISExperimentControls@stfc.ac.uk" } +] + +# Classifiers help users find your project by categorizing it. +# +# For a list of valid classifiers, see https://pypi.org/classifiers/ +classifiers = [ + # How mature is this project? Common values are + # 3 - Alpha + # 4 - Beta + # 5 - Production/Stable + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + + # Specify the Python versions you support here. In particular, ensure + # that you indicate you support Python 3. These classifiers are *not* + # checked by "pip install". See instead "requires-python" key in this file. + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3 :: Only", +] + +dependencies = [ + "flatbuffers", + "numpy>2" +] + +[project.optional-dependencies] +dev = [ + "ruff>=0.8", + "pyright", + "pytest", + "pytest-cov", +] + +[project.urls] +"Homepage" = "https://github.com/isiscomputinggroup/isis_streaming_data_types" +"Bug Reports" = "https://github.com/isiscomputinggroup/isis_streaming_data_types/issues" +"Source" = "https://github.com/isiscomputinggroup/isis_streaming_data_types" + +[tool.pytest.ini_options] +testpaths = "tests" +asyncio_mode = "auto" +addopts = "--cov --cov-report=html -vv" +filterwarnings = [ + 'ignore:FigureCanvasAgg is non-interactive, and thus cannot be shown:UserWarning', + 'error:Using UFloat objects with std_dev==0 may give unexpected results.:UserWarning', +] + +[tool.coverage.run] +branch = true +source = ["src"] + +[tool.coverage.report] +fail_under = 100 +exclude_lines = [ + "pragma: no cover", + "if TYPE_CHECKING:", + "if typing.TYPE_CHECKING:", + "@abstractmethod", +] + +[tool.coverage.html] +directory = "coverage_html_report" + +[tool.pyright] +include = ["src", "tests"] +reportConstantRedefinition = true +reportDeprecated = true +reportInconsistentConstructor = true +reportMissingParameterType = true +reportMissingTypeArgument = true +reportUnnecessaryCast = true +reportUnnecessaryComparison = true +reportUnnecessaryContains = true +reportUnnecessaryIsInstance = true +reportUntypedBaseClass = true +reportUntypedClassDecorator = true +reportUntypedFunctionDecorator = true + +[tool.setuptools_scm] +version_file = "src/streaming_data_types/_version.py" + + diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 05210d8..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,10 +0,0 @@ --r requirements.txt -black -flake8 -isort -pre-commit -pytest -tox==3.27.1 # tox 4 seems to be broken at the moment -tox-pyenv -twine -wheel diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 38f5b4f..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -flatbuffers -numpy<2.0.0 diff --git a/setup.py b/setup.py deleted file mode 100644 index 96bcc1f..0000000 --- a/setup.py +++ /dev/null @@ -1,32 +0,0 @@ -import os - -from setuptools import find_packages, setup - -from streaming_data_types._version import version - -DESCRIPTION = "Python utilities for handling ESS streamed data" - -here = os.path.abspath(os.path.dirname(__file__)) - -# Import the README and use it as the long-description. -try: - with open(os.path.join(here, "README.md"), encoding="utf-8") as f: - LONG_DESCRIPTION = "\n" + f.read() -except Exception as error: - print("COULD NOT GET LONG DESC: {}".format(error)) - LONG_DESCRIPTION = DESCRIPTION - -setup( - name="ess_streaming_data_types", - version=version, - description=DESCRIPTION, - long_description=LONG_DESCRIPTION, - long_description_content_type="text/markdown", - author="ScreamingUdder", - url="https://github.com/ess-dmsc/python-streaming-data-types", - license="BSD 2-Clause License", - packages=find_packages(exclude=["tests", "tests.*"]), - python_requires=">=3.6.0", - install_requires=["flatbuffers", "numpy"], - extras_require={"dev": ["flake8", "pre-commit", "pytest", "tox"]}, -) diff --git a/streaming_data_types/__init__.py b/src/streaming_data_types/__init__.py similarity index 100% rename from streaming_data_types/__init__.py rename to src/streaming_data_types/__init__.py index 2757dfe..b163503 100644 --- a/streaming_data_types/__init__.py +++ b/src/streaming_data_types/__init__.py @@ -39,10 +39,10 @@ ) from streaming_data_types.status_x5f2 import deserialise_x5f2, serialise_x5f2 from streaming_data_types.timestamps_tdct import deserialise_tdct, serialise_tdct +from streaming_data_types.units_un00 import serialise_un00, deserialise_un00 __version__ = version -from streaming_data_types.units_un00 import serialise_un00, deserialise_un00 SERIALISERS = { "an44": serialise_an44, diff --git a/streaming_data_types/action_response_answ.py b/src/streaming_data_types/action_response_answ.py similarity index 100% rename from streaming_data_types/action_response_answ.py rename to src/streaming_data_types/action_response_answ.py diff --git a/streaming_data_types/alarm_al00.py b/src/streaming_data_types/alarm_al00.py similarity index 100% rename from streaming_data_types/alarm_al00.py rename to src/streaming_data_types/alarm_al00.py diff --git a/streaming_data_types/area_detector_ADAr.py b/src/streaming_data_types/area_detector_ADAr.py similarity index 100% rename from streaming_data_types/area_detector_ADAr.py rename to src/streaming_data_types/area_detector_ADAr.py diff --git a/streaming_data_types/area_detector_NDAr.py b/src/streaming_data_types/area_detector_NDAr.py similarity index 100% rename from streaming_data_types/area_detector_NDAr.py rename to src/streaming_data_types/area_detector_NDAr.py diff --git a/streaming_data_types/area_detector_ad00.py b/src/streaming_data_types/area_detector_ad00.py similarity index 100% rename from streaming_data_types/area_detector_ad00.py rename to src/streaming_data_types/area_detector_ad00.py diff --git a/streaming_data_types/array_1d_se00.py b/src/streaming_data_types/array_1d_se00.py similarity index 100% rename from streaming_data_types/array_1d_se00.py rename to src/streaming_data_types/array_1d_se00.py diff --git a/streaming_data_types/dataarray_da00.py b/src/streaming_data_types/dataarray_da00.py similarity index 100% rename from streaming_data_types/dataarray_da00.py rename to src/streaming_data_types/dataarray_da00.py diff --git a/streaming_data_types/epics_connection_ep01.py b/src/streaming_data_types/epics_connection_ep01.py similarity index 100% rename from streaming_data_types/epics_connection_ep01.py rename to src/streaming_data_types/epics_connection_ep01.py diff --git a/streaming_data_types/epics_connection_info_ep00.py b/src/streaming_data_types/epics_connection_info_ep00.py similarity index 100% rename from streaming_data_types/epics_connection_info_ep00.py rename to src/streaming_data_types/epics_connection_info_ep00.py diff --git a/streaming_data_types/eventdata_an44.py b/src/streaming_data_types/eventdata_an44.py similarity index 100% rename from streaming_data_types/eventdata_an44.py rename to src/streaming_data_types/eventdata_an44.py diff --git a/streaming_data_types/eventdata_ev42.py b/src/streaming_data_types/eventdata_ev42.py similarity index 100% rename from streaming_data_types/eventdata_ev42.py rename to src/streaming_data_types/eventdata_ev42.py diff --git a/streaming_data_types/eventdata_ev43.py b/src/streaming_data_types/eventdata_ev43.py similarity index 100% rename from streaming_data_types/eventdata_ev43.py rename to src/streaming_data_types/eventdata_ev43.py diff --git a/streaming_data_types/eventdata_ev44.py b/src/streaming_data_types/eventdata_ev44.py similarity index 100% rename from streaming_data_types/eventdata_ev44.py rename to src/streaming_data_types/eventdata_ev44.py diff --git a/streaming_data_types/exceptions.py b/src/streaming_data_types/exceptions.py similarity index 100% rename from streaming_data_types/exceptions.py rename to src/streaming_data_types/exceptions.py diff --git a/streaming_data_types/fbschemas/ADAr_ADArray_schema/ADArray.py b/src/streaming_data_types/fbschemas/ADAr_ADArray_schema/ADArray.py similarity index 100% rename from streaming_data_types/fbschemas/ADAr_ADArray_schema/ADArray.py rename to src/streaming_data_types/fbschemas/ADAr_ADArray_schema/ADArray.py diff --git a/streaming_data_types/fbschemas/ADAr_ADArray_schema/Attribute.py b/src/streaming_data_types/fbschemas/ADAr_ADArray_schema/Attribute.py similarity index 100% rename from streaming_data_types/fbschemas/ADAr_ADArray_schema/Attribute.py rename to src/streaming_data_types/fbschemas/ADAr_ADArray_schema/Attribute.py diff --git a/streaming_data_types/fbschemas/ADAr_ADArray_schema/DType.py b/src/streaming_data_types/fbschemas/ADAr_ADArray_schema/DType.py similarity index 100% rename from streaming_data_types/fbschemas/ADAr_ADArray_schema/DType.py rename to src/streaming_data_types/fbschemas/ADAr_ADArray_schema/DType.py diff --git a/streaming_data_types/fbschemas/ADAr_ADArray_schema/__init__.py b/src/streaming_data_types/fbschemas/ADAr_ADArray_schema/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/ADAr_ADArray_schema/__init__.py rename to src/streaming_data_types/fbschemas/ADAr_ADArray_schema/__init__.py diff --git a/streaming_data_types/fbschemas/NDAr_NDArray_schema/DType.py b/src/streaming_data_types/fbschemas/NDAr_NDArray_schema/DType.py similarity index 100% rename from streaming_data_types/fbschemas/NDAr_NDArray_schema/DType.py rename to src/streaming_data_types/fbschemas/NDAr_NDArray_schema/DType.py diff --git a/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDArray.py b/src/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDArray.py similarity index 100% rename from streaming_data_types/fbschemas/NDAr_NDArray_schema/NDArray.py rename to src/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDArray.py diff --git a/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDAttribute.py b/src/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDAttribute.py similarity index 100% rename from streaming_data_types/fbschemas/NDAr_NDArray_schema/NDAttribute.py rename to src/streaming_data_types/fbschemas/NDAr_NDArray_schema/NDAttribute.py diff --git a/streaming_data_types/fbschemas/NDAr_NDArray_schema/__init__.py b/src/streaming_data_types/fbschemas/NDAr_NDArray_schema/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/NDAr_NDArray_schema/__init__.py rename to src/streaming_data_types/fbschemas/NDAr_NDArray_schema/__init__.py diff --git a/streaming_data_types/fbschemas/NDAr_NDArray_schema/epicsTimeStamp.py b/src/streaming_data_types/fbschemas/NDAr_NDArray_schema/epicsTimeStamp.py similarity index 100% rename from streaming_data_types/fbschemas/NDAr_NDArray_schema/epicsTimeStamp.py rename to src/streaming_data_types/fbschemas/NDAr_NDArray_schema/epicsTimeStamp.py diff --git a/streaming_data_types/fbschemas/__init__.py b/src/streaming_data_types/fbschemas/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/__init__.py rename to src/streaming_data_types/fbschemas/__init__.py diff --git a/streaming_data_types/fbschemas/action_response_answ/ActionOutcome.py b/src/streaming_data_types/fbschemas/action_response_answ/ActionOutcome.py similarity index 100% rename from streaming_data_types/fbschemas/action_response_answ/ActionOutcome.py rename to src/streaming_data_types/fbschemas/action_response_answ/ActionOutcome.py diff --git a/streaming_data_types/fbschemas/action_response_answ/ActionResponse.py b/src/streaming_data_types/fbschemas/action_response_answ/ActionResponse.py similarity index 100% rename from streaming_data_types/fbschemas/action_response_answ/ActionResponse.py rename to src/streaming_data_types/fbschemas/action_response_answ/ActionResponse.py diff --git a/streaming_data_types/fbschemas/action_response_answ/ActionType.py b/src/streaming_data_types/fbschemas/action_response_answ/ActionType.py similarity index 100% rename from streaming_data_types/fbschemas/action_response_answ/ActionType.py rename to src/streaming_data_types/fbschemas/action_response_answ/ActionType.py diff --git a/streaming_data_types/fbschemas/action_response_answ/__init__.py b/src/streaming_data_types/fbschemas/action_response_answ/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/action_response_answ/__init__.py rename to src/streaming_data_types/fbschemas/action_response_answ/__init__.py diff --git a/streaming_data_types/fbschemas/alarm_al00/Alarm.py b/src/streaming_data_types/fbschemas/alarm_al00/Alarm.py similarity index 100% rename from streaming_data_types/fbschemas/alarm_al00/Alarm.py rename to src/streaming_data_types/fbschemas/alarm_al00/Alarm.py diff --git a/streaming_data_types/fbschemas/alarm_al00/Severity.py b/src/streaming_data_types/fbschemas/alarm_al00/Severity.py similarity index 100% rename from streaming_data_types/fbschemas/alarm_al00/Severity.py rename to src/streaming_data_types/fbschemas/alarm_al00/Severity.py diff --git a/streaming_data_types/fbschemas/alarm_al00/__init__.py b/src/streaming_data_types/fbschemas/alarm_al00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/alarm_al00/__init__.py rename to src/streaming_data_types/fbschemas/alarm_al00/__init__.py diff --git a/streaming_data_types/fbschemas/area_detector_ad00/Attribute.py b/src/streaming_data_types/fbschemas/area_detector_ad00/Attribute.py similarity index 100% rename from streaming_data_types/fbschemas/area_detector_ad00/Attribute.py rename to src/streaming_data_types/fbschemas/area_detector_ad00/Attribute.py diff --git a/streaming_data_types/fbschemas/area_detector_ad00/DType.py b/src/streaming_data_types/fbschemas/area_detector_ad00/DType.py similarity index 100% rename from streaming_data_types/fbschemas/area_detector_ad00/DType.py rename to src/streaming_data_types/fbschemas/area_detector_ad00/DType.py diff --git a/streaming_data_types/fbschemas/area_detector_ad00/__init__.py b/src/streaming_data_types/fbschemas/area_detector_ad00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/area_detector_ad00/__init__.py rename to src/streaming_data_types/fbschemas/area_detector_ad00/__init__.py diff --git a/streaming_data_types/fbschemas/area_detector_ad00/ad00_ADArray.py b/src/streaming_data_types/fbschemas/area_detector_ad00/ad00_ADArray.py similarity index 100% rename from streaming_data_types/fbschemas/area_detector_ad00/ad00_ADArray.py rename to src/streaming_data_types/fbschemas/area_detector_ad00/ad00_ADArray.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/DoubleArray.py b/src/streaming_data_types/fbschemas/array_1d_se00/DoubleArray.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/DoubleArray.py rename to src/streaming_data_types/fbschemas/array_1d_se00/DoubleArray.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/FloatArray.py b/src/streaming_data_types/fbschemas/array_1d_se00/FloatArray.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/FloatArray.py rename to src/streaming_data_types/fbschemas/array_1d_se00/FloatArray.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/Int16Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/Int16Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/Int16Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/Int16Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/Int32Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/Int32Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/Int32Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/Int32Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/Int64Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/Int64Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/Int64Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/Int64Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/Int8Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/Int8Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/Int8Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/Int8Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/Location.py b/src/streaming_data_types/fbschemas/array_1d_se00/Location.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/Location.py rename to src/streaming_data_types/fbschemas/array_1d_se00/Location.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/UInt16Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/UInt16Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/UInt16Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/UInt16Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/UInt32Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/UInt32Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/UInt32Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/UInt32Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/UInt64Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/UInt64Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/UInt64Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/UInt64Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/UInt8Array.py b/src/streaming_data_types/fbschemas/array_1d_se00/UInt8Array.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/UInt8Array.py rename to src/streaming_data_types/fbschemas/array_1d_se00/UInt8Array.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/ValueUnion.py b/src/streaming_data_types/fbschemas/array_1d_se00/ValueUnion.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/ValueUnion.py rename to src/streaming_data_types/fbschemas/array_1d_se00/ValueUnion.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/__init__.py b/src/streaming_data_types/fbschemas/array_1d_se00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/__init__.py rename to src/streaming_data_types/fbschemas/array_1d_se00/__init__.py diff --git a/streaming_data_types/fbschemas/array_1d_se00/se00_SampleEnvironmentData.py b/src/streaming_data_types/fbschemas/array_1d_se00/se00_SampleEnvironmentData.py similarity index 100% rename from streaming_data_types/fbschemas/array_1d_se00/se00_SampleEnvironmentData.py rename to src/streaming_data_types/fbschemas/array_1d_se00/se00_SampleEnvironmentData.py diff --git a/streaming_data_types/fbschemas/dataarray_da00/__init__.py b/src/streaming_data_types/fbschemas/dataarray_da00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/dataarray_da00/__init__.py rename to src/streaming_data_types/fbschemas/dataarray_da00/__init__.py diff --git a/streaming_data_types/fbschemas/dataarray_da00/da00_DataArray.py b/src/streaming_data_types/fbschemas/dataarray_da00/da00_DataArray.py similarity index 100% rename from streaming_data_types/fbschemas/dataarray_da00/da00_DataArray.py rename to src/streaming_data_types/fbschemas/dataarray_da00/da00_DataArray.py diff --git a/streaming_data_types/fbschemas/dataarray_da00/da00_Variable.py b/src/streaming_data_types/fbschemas/dataarray_da00/da00_Variable.py similarity index 100% rename from streaming_data_types/fbschemas/dataarray_da00/da00_Variable.py rename to src/streaming_data_types/fbschemas/dataarray_da00/da00_Variable.py diff --git a/streaming_data_types/fbschemas/dataarray_da00/da00_dtype.py b/src/streaming_data_types/fbschemas/dataarray_da00/da00_dtype.py similarity index 100% rename from streaming_data_types/fbschemas/dataarray_da00/da00_dtype.py rename to src/streaming_data_types/fbschemas/dataarray_da00/da00_dtype.py diff --git a/streaming_data_types/fbschemas/epics_connection_ep01/ConnectionInfo.py b/src/streaming_data_types/fbschemas/epics_connection_ep01/ConnectionInfo.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_ep01/ConnectionInfo.py rename to src/streaming_data_types/fbschemas/epics_connection_ep01/ConnectionInfo.py diff --git a/streaming_data_types/fbschemas/epics_connection_ep01/EpicsPVConnectionInfo.py b/src/streaming_data_types/fbschemas/epics_connection_ep01/EpicsPVConnectionInfo.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_ep01/EpicsPVConnectionInfo.py rename to src/streaming_data_types/fbschemas/epics_connection_ep01/EpicsPVConnectionInfo.py diff --git a/streaming_data_types/fbschemas/epics_connection_ep01/__init__.py b/src/streaming_data_types/fbschemas/epics_connection_ep01/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_ep01/__init__.py rename to src/streaming_data_types/fbschemas/epics_connection_ep01/__init__.py diff --git a/streaming_data_types/fbschemas/epics_connection_info_ep00/EpicsConnectionInfo.py b/src/streaming_data_types/fbschemas/epics_connection_info_ep00/EpicsConnectionInfo.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_info_ep00/EpicsConnectionInfo.py rename to src/streaming_data_types/fbschemas/epics_connection_info_ep00/EpicsConnectionInfo.py diff --git a/streaming_data_types/fbschemas/epics_connection_info_ep00/EventType.py b/src/streaming_data_types/fbschemas/epics_connection_info_ep00/EventType.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_info_ep00/EventType.py rename to src/streaming_data_types/fbschemas/epics_connection_info_ep00/EventType.py diff --git a/streaming_data_types/fbschemas/epics_connection_info_ep00/__init__.py b/src/streaming_data_types/fbschemas/epics_connection_info_ep00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/epics_connection_info_ep00/__init__.py rename to src/streaming_data_types/fbschemas/epics_connection_info_ep00/__init__.py diff --git a/streaming_data_types/fbschemas/eventdata_an44/AN44EventMessage.py b/src/streaming_data_types/fbschemas/eventdata_an44/AN44EventMessage.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_an44/AN44EventMessage.py rename to src/streaming_data_types/fbschemas/eventdata_an44/AN44EventMessage.py diff --git a/streaming_data_types/fbschemas/eventdata_an44/__init__.py b/src/streaming_data_types/fbschemas/eventdata_an44/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_an44/__init__.py rename to src/streaming_data_types/fbschemas/eventdata_an44/__init__.py diff --git a/streaming_data_types/fbschemas/eventdata_ev42/EventMessage.py b/src/streaming_data_types/fbschemas/eventdata_ev42/EventMessage.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev42/EventMessage.py rename to src/streaming_data_types/fbschemas/eventdata_ev42/EventMessage.py diff --git a/streaming_data_types/fbschemas/eventdata_ev42/FacilityData.py b/src/streaming_data_types/fbschemas/eventdata_ev42/FacilityData.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev42/FacilityData.py rename to src/streaming_data_types/fbschemas/eventdata_ev42/FacilityData.py diff --git a/streaming_data_types/fbschemas/eventdata_ev42/__init__.py b/src/streaming_data_types/fbschemas/eventdata_ev42/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev42/__init__.py rename to src/streaming_data_types/fbschemas/eventdata_ev42/__init__.py diff --git a/streaming_data_types/fbschemas/eventdata_ev43/Event43Message.py b/src/streaming_data_types/fbschemas/eventdata_ev43/Event43Message.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev43/Event43Message.py rename to src/streaming_data_types/fbschemas/eventdata_ev43/Event43Message.py diff --git a/streaming_data_types/fbschemas/eventdata_ev43/__init__.py b/src/streaming_data_types/fbschemas/eventdata_ev43/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev43/__init__.py rename to src/streaming_data_types/fbschemas/eventdata_ev43/__init__.py diff --git a/streaming_data_types/fbschemas/eventdata_ev44/Event44Message.py b/src/streaming_data_types/fbschemas/eventdata_ev44/Event44Message.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev44/Event44Message.py rename to src/streaming_data_types/fbschemas/eventdata_ev44/Event44Message.py diff --git a/streaming_data_types/fbschemas/eventdata_ev44/__init__.py b/src/streaming_data_types/fbschemas/eventdata_ev44/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/eventdata_ev44/__init__.py rename to src/streaming_data_types/fbschemas/eventdata_ev44/__init__.py diff --git a/streaming_data_types/fbschemas/finished_writing_wrdn/FinishedWriting.py b/src/streaming_data_types/fbschemas/finished_writing_wrdn/FinishedWriting.py similarity index 100% rename from streaming_data_types/fbschemas/finished_writing_wrdn/FinishedWriting.py rename to src/streaming_data_types/fbschemas/finished_writing_wrdn/FinishedWriting.py diff --git a/streaming_data_types/fbschemas/finished_writing_wrdn/__init__.py b/src/streaming_data_types/fbschemas/finished_writing_wrdn/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/finished_writing_wrdn/__init__.py rename to src/streaming_data_types/fbschemas/finished_writing_wrdn/__init__.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_fc00/Protocol.py b/src/streaming_data_types/fbschemas/forwarder_config_update_fc00/Protocol.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_fc00/Protocol.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_fc00/Protocol.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_fc00/Stream.py b/src/streaming_data_types/fbschemas/forwarder_config_update_fc00/Stream.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_fc00/Stream.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_fc00/Stream.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_fc00/UpdateType.py b/src/streaming_data_types/fbschemas/forwarder_config_update_fc00/UpdateType.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_fc00/UpdateType.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_fc00/UpdateType.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_fc00/__init__.py b/src/streaming_data_types/fbschemas/forwarder_config_update_fc00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_fc00/__init__.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_fc00/__init__.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_fc00/fc00_ConfigUpdate.py b/src/streaming_data_types/fbschemas/forwarder_config_update_fc00/fc00_ConfigUpdate.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_fc00/fc00_ConfigUpdate.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_fc00/fc00_ConfigUpdate.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_rf5k/ConfigUpdate.py b/src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/ConfigUpdate.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_rf5k/ConfigUpdate.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/ConfigUpdate.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Protocol.py b/src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Protocol.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_rf5k/Protocol.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Protocol.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Stream.py b/src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Stream.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_rf5k/Stream.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/Stream.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_rf5k/UpdateType.py b/src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/UpdateType.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_rf5k/UpdateType.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/UpdateType.py diff --git a/streaming_data_types/fbschemas/forwarder_config_update_rf5k/__init__.py b/src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/forwarder_config_update_rf5k/__init__.py rename to src/streaming_data_types/fbschemas/forwarder_config_update_rf5k/__init__.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/Array.py b/src/streaming_data_types/fbschemas/histogram_hs00/Array.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/Array.py rename to src/streaming_data_types/fbschemas/histogram_hs00/Array.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/ArrayDouble.py b/src/streaming_data_types/fbschemas/histogram_hs00/ArrayDouble.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/ArrayDouble.py rename to src/streaming_data_types/fbschemas/histogram_hs00/ArrayDouble.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/ArrayFloat.py b/src/streaming_data_types/fbschemas/histogram_hs00/ArrayFloat.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/ArrayFloat.py rename to src/streaming_data_types/fbschemas/histogram_hs00/ArrayFloat.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/ArrayUInt.py b/src/streaming_data_types/fbschemas/histogram_hs00/ArrayUInt.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/ArrayUInt.py rename to src/streaming_data_types/fbschemas/histogram_hs00/ArrayUInt.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/ArrayULong.py b/src/streaming_data_types/fbschemas/histogram_hs00/ArrayULong.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/ArrayULong.py rename to src/streaming_data_types/fbschemas/histogram_hs00/ArrayULong.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/DimensionMetaData.py b/src/streaming_data_types/fbschemas/histogram_hs00/DimensionMetaData.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/DimensionMetaData.py rename to src/streaming_data_types/fbschemas/histogram_hs00/DimensionMetaData.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/EventHistogram.py b/src/streaming_data_types/fbschemas/histogram_hs00/EventHistogram.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/EventHistogram.py rename to src/streaming_data_types/fbschemas/histogram_hs00/EventHistogram.py diff --git a/streaming_data_types/fbschemas/histogram_hs00/__init__.py b/src/streaming_data_types/fbschemas/histogram_hs00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs00/__init__.py rename to src/streaming_data_types/fbschemas/histogram_hs00/__init__.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/Array.py b/src/streaming_data_types/fbschemas/histogram_hs01/Array.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/Array.py rename to src/streaming_data_types/fbschemas/histogram_hs01/Array.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/ArrayDouble.py b/src/streaming_data_types/fbschemas/histogram_hs01/ArrayDouble.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/ArrayDouble.py rename to src/streaming_data_types/fbschemas/histogram_hs01/ArrayDouble.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/ArrayFloat.py b/src/streaming_data_types/fbschemas/histogram_hs01/ArrayFloat.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/ArrayFloat.py rename to src/streaming_data_types/fbschemas/histogram_hs01/ArrayFloat.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/ArrayInt.py b/src/streaming_data_types/fbschemas/histogram_hs01/ArrayInt.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/ArrayInt.py rename to src/streaming_data_types/fbschemas/histogram_hs01/ArrayInt.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/ArrayLong.py b/src/streaming_data_types/fbschemas/histogram_hs01/ArrayLong.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/ArrayLong.py rename to src/streaming_data_types/fbschemas/histogram_hs01/ArrayLong.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/DimensionMetaData.py b/src/streaming_data_types/fbschemas/histogram_hs01/DimensionMetaData.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/DimensionMetaData.py rename to src/streaming_data_types/fbschemas/histogram_hs01/DimensionMetaData.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/EventHistogram.py b/src/streaming_data_types/fbschemas/histogram_hs01/EventHistogram.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/EventHistogram.py rename to src/streaming_data_types/fbschemas/histogram_hs01/EventHistogram.py diff --git a/streaming_data_types/fbschemas/histogram_hs01/__init__.py b/src/streaming_data_types/fbschemas/histogram_hs01/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/histogram_hs01/__init__.py rename to src/streaming_data_types/fbschemas/histogram_hs01/__init__.py diff --git a/streaming_data_types/fbschemas/isis_event_info_is84/ISISData.py b/src/streaming_data_types/fbschemas/isis_event_info_is84/ISISData.py similarity index 100% rename from streaming_data_types/fbschemas/isis_event_info_is84/ISISData.py rename to src/streaming_data_types/fbschemas/isis_event_info_is84/ISISData.py diff --git a/streaming_data_types/fbschemas/isis_event_info_is84/RunState.py b/src/streaming_data_types/fbschemas/isis_event_info_is84/RunState.py similarity index 100% rename from streaming_data_types/fbschemas/isis_event_info_is84/RunState.py rename to src/streaming_data_types/fbschemas/isis_event_info_is84/RunState.py diff --git a/streaming_data_types/fbschemas/isis_event_info_is84/__init__.py b/src/streaming_data_types/fbschemas/isis_event_info_is84/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/isis_event_info_is84/__init__.py rename to src/streaming_data_types/fbschemas/isis_event_info_is84/__init__.py diff --git a/streaming_data_types/fbschemas/json_json/JsonData.py b/src/streaming_data_types/fbschemas/json_json/JsonData.py similarity index 100% rename from streaming_data_types/fbschemas/json_json/JsonData.py rename to src/streaming_data_types/fbschemas/json_json/JsonData.py diff --git a/streaming_data_types/fbschemas/json_json/__init__.py b/src/streaming_data_types/fbschemas/json_json/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/json_json/__init__.py rename to src/streaming_data_types/fbschemas/json_json/__init__.py diff --git a/streaming_data_types/fbschemas/logdata_f142/AlarmSeverity.py b/src/streaming_data_types/fbschemas/logdata_f142/AlarmSeverity.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/AlarmSeverity.py rename to src/streaming_data_types/fbschemas/logdata_f142/AlarmSeverity.py diff --git a/streaming_data_types/fbschemas/logdata_f142/AlarmStatus.py b/src/streaming_data_types/fbschemas/logdata_f142/AlarmStatus.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/AlarmStatus.py rename to src/streaming_data_types/fbschemas/logdata_f142/AlarmStatus.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayByte.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayByte.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayByte.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayDouble.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayDouble.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayDouble.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayDouble.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayFloat.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayFloat.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayFloat.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayFloat.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayInt.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayInt.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayInt.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayLong.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayLong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayLong.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayLong.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayShort.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayShort.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayShort.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayString.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayString.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayString.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayString.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayUByte.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayUByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayUByte.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayUByte.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayUInt.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayUInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayUInt.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayUInt.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayULong.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayULong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayULong.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayULong.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ArrayUShort.py b/src/streaming_data_types/fbschemas/logdata_f142/ArrayUShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ArrayUShort.py rename to src/streaming_data_types/fbschemas/logdata_f142/ArrayUShort.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Byte.py b/src/streaming_data_types/fbschemas/logdata_f142/Byte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Byte.py rename to src/streaming_data_types/fbschemas/logdata_f142/Byte.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Double.py b/src/streaming_data_types/fbschemas/logdata_f142/Double.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Double.py rename to src/streaming_data_types/fbschemas/logdata_f142/Double.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Float.py b/src/streaming_data_types/fbschemas/logdata_f142/Float.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Float.py rename to src/streaming_data_types/fbschemas/logdata_f142/Float.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Int.py b/src/streaming_data_types/fbschemas/logdata_f142/Int.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Int.py rename to src/streaming_data_types/fbschemas/logdata_f142/Int.py diff --git a/streaming_data_types/fbschemas/logdata_f142/LogData.py b/src/streaming_data_types/fbschemas/logdata_f142/LogData.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/LogData.py rename to src/streaming_data_types/fbschemas/logdata_f142/LogData.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Long.py b/src/streaming_data_types/fbschemas/logdata_f142/Long.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Long.py rename to src/streaming_data_types/fbschemas/logdata_f142/Long.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Short.py b/src/streaming_data_types/fbschemas/logdata_f142/Short.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Short.py rename to src/streaming_data_types/fbschemas/logdata_f142/Short.py diff --git a/streaming_data_types/fbschemas/logdata_f142/String.py b/src/streaming_data_types/fbschemas/logdata_f142/String.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/String.py rename to src/streaming_data_types/fbschemas/logdata_f142/String.py diff --git a/streaming_data_types/fbschemas/logdata_f142/UByte.py b/src/streaming_data_types/fbschemas/logdata_f142/UByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/UByte.py rename to src/streaming_data_types/fbschemas/logdata_f142/UByte.py diff --git a/streaming_data_types/fbschemas/logdata_f142/UInt.py b/src/streaming_data_types/fbschemas/logdata_f142/UInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/UInt.py rename to src/streaming_data_types/fbschemas/logdata_f142/UInt.py diff --git a/streaming_data_types/fbschemas/logdata_f142/ULong.py b/src/streaming_data_types/fbschemas/logdata_f142/ULong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/ULong.py rename to src/streaming_data_types/fbschemas/logdata_f142/ULong.py diff --git a/streaming_data_types/fbschemas/logdata_f142/UShort.py b/src/streaming_data_types/fbschemas/logdata_f142/UShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/UShort.py rename to src/streaming_data_types/fbschemas/logdata_f142/UShort.py diff --git a/streaming_data_types/fbschemas/logdata_f142/Value.py b/src/streaming_data_types/fbschemas/logdata_f142/Value.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/Value.py rename to src/streaming_data_types/fbschemas/logdata_f142/Value.py diff --git a/streaming_data_types/fbschemas/logdata_f142/__init__.py b/src/streaming_data_types/fbschemas/logdata_f142/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f142/__init__.py rename to src/streaming_data_types/fbschemas/logdata_f142/__init__.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayByte.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayByte.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayByte.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayDouble.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayDouble.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayDouble.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayDouble.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayFloat.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayFloat.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayFloat.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayFloat.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayInt.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayInt.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayInt.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayLong.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayLong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayLong.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayLong.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayShort.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayShort.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayShort.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayUByte.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayUByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayUByte.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayUByte.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayUInt.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayUInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayUInt.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayUInt.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayULong.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayULong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayULong.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayULong.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ArrayUShort.py b/src/streaming_data_types/fbschemas/logdata_f144/ArrayUShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ArrayUShort.py rename to src/streaming_data_types/fbschemas/logdata_f144/ArrayUShort.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Byte.py b/src/streaming_data_types/fbschemas/logdata_f144/Byte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Byte.py rename to src/streaming_data_types/fbschemas/logdata_f144/Byte.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Double.py b/src/streaming_data_types/fbschemas/logdata_f144/Double.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Double.py rename to src/streaming_data_types/fbschemas/logdata_f144/Double.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Float.py b/src/streaming_data_types/fbschemas/logdata_f144/Float.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Float.py rename to src/streaming_data_types/fbschemas/logdata_f144/Float.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Int.py b/src/streaming_data_types/fbschemas/logdata_f144/Int.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Int.py rename to src/streaming_data_types/fbschemas/logdata_f144/Int.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Long.py b/src/streaming_data_types/fbschemas/logdata_f144/Long.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Long.py rename to src/streaming_data_types/fbschemas/logdata_f144/Long.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Short.py b/src/streaming_data_types/fbschemas/logdata_f144/Short.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Short.py rename to src/streaming_data_types/fbschemas/logdata_f144/Short.py diff --git a/streaming_data_types/fbschemas/logdata_f144/UByte.py b/src/streaming_data_types/fbschemas/logdata_f144/UByte.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/UByte.py rename to src/streaming_data_types/fbschemas/logdata_f144/UByte.py diff --git a/streaming_data_types/fbschemas/logdata_f144/UInt.py b/src/streaming_data_types/fbschemas/logdata_f144/UInt.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/UInt.py rename to src/streaming_data_types/fbschemas/logdata_f144/UInt.py diff --git a/streaming_data_types/fbschemas/logdata_f144/ULong.py b/src/streaming_data_types/fbschemas/logdata_f144/ULong.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/ULong.py rename to src/streaming_data_types/fbschemas/logdata_f144/ULong.py diff --git a/streaming_data_types/fbschemas/logdata_f144/UShort.py b/src/streaming_data_types/fbschemas/logdata_f144/UShort.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/UShort.py rename to src/streaming_data_types/fbschemas/logdata_f144/UShort.py diff --git a/streaming_data_types/fbschemas/logdata_f144/Value.py b/src/streaming_data_types/fbschemas/logdata_f144/Value.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/Value.py rename to src/streaming_data_types/fbschemas/logdata_f144/Value.py diff --git a/streaming_data_types/fbschemas/logdata_f144/__init__.py b/src/streaming_data_types/fbschemas/logdata_f144/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/__init__.py rename to src/streaming_data_types/fbschemas/logdata_f144/__init__.py diff --git a/streaming_data_types/fbschemas/logdata_f144/f144_LogData.py b/src/streaming_data_types/fbschemas/logdata_f144/f144_LogData.py similarity index 100% rename from streaming_data_types/fbschemas/logdata_f144/f144_LogData.py rename to src/streaming_data_types/fbschemas/logdata_f144/f144_LogData.py diff --git a/streaming_data_types/fbschemas/nicos_cache_ns10/CacheEntry.py b/src/streaming_data_types/fbschemas/nicos_cache_ns10/CacheEntry.py similarity index 100% rename from streaming_data_types/fbschemas/nicos_cache_ns10/CacheEntry.py rename to src/streaming_data_types/fbschemas/nicos_cache_ns10/CacheEntry.py diff --git a/streaming_data_types/fbschemas/nicos_cache_ns10/__init__.py b/src/streaming_data_types/fbschemas/nicos_cache_ns10/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/nicos_cache_ns10/__init__.py rename to src/streaming_data_types/fbschemas/nicos_cache_ns10/__init__.py diff --git a/streaming_data_types/fbschemas/nmx_mo01/__init__.py b/src/streaming_data_types/fbschemas/nmx_mo01/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/nmx_mo01/__init__.py rename to src/streaming_data_types/fbschemas/nmx_mo01/__init__.py diff --git a/streaming_data_types/fbschemas/readout_data_ar51/RawReadoutMessage.py b/src/streaming_data_types/fbschemas/readout_data_ar51/RawReadoutMessage.py similarity index 100% rename from streaming_data_types/fbschemas/readout_data_ar51/RawReadoutMessage.py rename to src/streaming_data_types/fbschemas/readout_data_ar51/RawReadoutMessage.py diff --git a/streaming_data_types/fbschemas/readout_data_ar51/__init__.py b/src/streaming_data_types/fbschemas/readout_data_ar51/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/readout_data_ar51/__init__.py rename to src/streaming_data_types/fbschemas/readout_data_ar51/__init__.py diff --git a/streaming_data_types/fbschemas/run_start_pl72/RunStart.py b/src/streaming_data_types/fbschemas/run_start_pl72/RunStart.py similarity index 100% rename from streaming_data_types/fbschemas/run_start_pl72/RunStart.py rename to src/streaming_data_types/fbschemas/run_start_pl72/RunStart.py diff --git a/streaming_data_types/fbschemas/run_start_pl72/SpectraDetectorMapping.py b/src/streaming_data_types/fbschemas/run_start_pl72/SpectraDetectorMapping.py similarity index 100% rename from streaming_data_types/fbschemas/run_start_pl72/SpectraDetectorMapping.py rename to src/streaming_data_types/fbschemas/run_start_pl72/SpectraDetectorMapping.py diff --git a/streaming_data_types/fbschemas/run_start_pl72/__init__.py b/src/streaming_data_types/fbschemas/run_start_pl72/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/run_start_pl72/__init__.py rename to src/streaming_data_types/fbschemas/run_start_pl72/__init__.py diff --git a/streaming_data_types/fbschemas/run_stop_6s4t/RunStop.py b/src/streaming_data_types/fbschemas/run_stop_6s4t/RunStop.py similarity index 100% rename from streaming_data_types/fbschemas/run_stop_6s4t/RunStop.py rename to src/streaming_data_types/fbschemas/run_stop_6s4t/RunStop.py diff --git a/streaming_data_types/fbschemas/run_stop_6s4t/__init__.py b/src/streaming_data_types/fbschemas/run_stop_6s4t/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/run_stop_6s4t/__init__.py rename to src/streaming_data_types/fbschemas/run_stop_6s4t/__init__.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/Int16Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/Int16Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/Int16Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/Int16Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/Int32Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/Int32Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/Int32Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/Int32Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/Int64Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/Int64Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/Int64Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/Int64Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/Int8Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/Int8Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/Int8Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/Int8Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/Location.py b/src/streaming_data_types/fbschemas/sample_environment_senv/Location.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/Location.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/Location.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/SampleEnvironmentData.py b/src/streaming_data_types/fbschemas/sample_environment_senv/SampleEnvironmentData.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/SampleEnvironmentData.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/SampleEnvironmentData.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/UInt16Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/UInt16Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/UInt16Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/UInt16Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/UInt32Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/UInt32Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/UInt32Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/UInt32Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/UInt64Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/UInt64Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/UInt64Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/UInt64Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/UInt8Array.py b/src/streaming_data_types/fbschemas/sample_environment_senv/UInt8Array.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/UInt8Array.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/UInt8Array.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/ValueUnion.py b/src/streaming_data_types/fbschemas/sample_environment_senv/ValueUnion.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/ValueUnion.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/ValueUnion.py diff --git a/streaming_data_types/fbschemas/sample_environment_senv/__init__.py b/src/streaming_data_types/fbschemas/sample_environment_senv/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/sample_environment_senv/__init__.py rename to src/streaming_data_types/fbschemas/sample_environment_senv/__init__.py diff --git a/streaming_data_types/fbschemas/status_x5f2/Status.py b/src/streaming_data_types/fbschemas/status_x5f2/Status.py similarity index 100% rename from streaming_data_types/fbschemas/status_x5f2/Status.py rename to src/streaming_data_types/fbschemas/status_x5f2/Status.py diff --git a/streaming_data_types/fbschemas/status_x5f2/__init__.py b/src/streaming_data_types/fbschemas/status_x5f2/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/status_x5f2/__init__.py rename to src/streaming_data_types/fbschemas/status_x5f2/__init__.py diff --git a/streaming_data_types/fbschemas/timestamps_tdct/__init__.py b/src/streaming_data_types/fbschemas/timestamps_tdct/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/timestamps_tdct/__init__.py rename to src/streaming_data_types/fbschemas/timestamps_tdct/__init__.py diff --git a/streaming_data_types/fbschemas/timestamps_tdct/timestamp.py b/src/streaming_data_types/fbschemas/timestamps_tdct/timestamp.py similarity index 100% rename from streaming_data_types/fbschemas/timestamps_tdct/timestamp.py rename to src/streaming_data_types/fbschemas/timestamps_tdct/timestamp.py diff --git a/streaming_data_types/fbschemas/units_un00/Units.py b/src/streaming_data_types/fbschemas/units_un00/Units.py similarity index 100% rename from streaming_data_types/fbschemas/units_un00/Units.py rename to src/streaming_data_types/fbschemas/units_un00/Units.py diff --git a/streaming_data_types/fbschemas/units_un00/__init__.py b/src/streaming_data_types/fbschemas/units_un00/__init__.py similarity index 100% rename from streaming_data_types/fbschemas/units_un00/__init__.py rename to src/streaming_data_types/fbschemas/units_un00/__init__.py diff --git a/streaming_data_types/finished_writing_wrdn.py b/src/streaming_data_types/finished_writing_wrdn.py similarity index 100% rename from streaming_data_types/finished_writing_wrdn.py rename to src/streaming_data_types/finished_writing_wrdn.py diff --git a/streaming_data_types/forwarder_config_update_fc00.py b/src/streaming_data_types/forwarder_config_update_fc00.py similarity index 100% rename from streaming_data_types/forwarder_config_update_fc00.py rename to src/streaming_data_types/forwarder_config_update_fc00.py diff --git a/streaming_data_types/forwarder_config_update_rf5k.py b/src/streaming_data_types/forwarder_config_update_rf5k.py similarity index 100% rename from streaming_data_types/forwarder_config_update_rf5k.py rename to src/streaming_data_types/forwarder_config_update_rf5k.py diff --git a/streaming_data_types/histogram_hs00.py b/src/streaming_data_types/histogram_hs00.py similarity index 100% rename from streaming_data_types/histogram_hs00.py rename to src/streaming_data_types/histogram_hs00.py diff --git a/streaming_data_types/histogram_hs01.py b/src/streaming_data_types/histogram_hs01.py similarity index 100% rename from streaming_data_types/histogram_hs01.py rename to src/streaming_data_types/histogram_hs01.py diff --git a/streaming_data_types/json_json.py b/src/streaming_data_types/json_json.py similarity index 100% rename from streaming_data_types/json_json.py rename to src/streaming_data_types/json_json.py diff --git a/streaming_data_types/logdata_f142.py b/src/streaming_data_types/logdata_f142.py similarity index 98% rename from streaming_data_types/logdata_f142.py rename to src/streaming_data_types/logdata_f142.py index 8186c63..ce35e88 100644 --- a/streaming_data_types/logdata_f142.py +++ b/src/streaming_data_types/logdata_f142.py @@ -490,8 +490,8 @@ def _serialise_value( ): # We can use a dictionary to map most numpy types to one of the types defined in the flatbuffer schema # but we have to handle strings separately as there are many subtypes - if np.issubdtype(value.dtype, np.unicode_) or np.issubdtype( - value.dtype, np.string_ + if np.issubdtype(value.dtype, np.str_) or np.issubdtype( + value.dtype, np.bytes_ ): string_serialiser(builder, value, source) else: @@ -501,7 +501,7 @@ def _serialise_value( # There are a few numpy types we don't try to handle, for example complex numbers raise NotImplementedError( f"Cannot serialise data of type {value.dtype}, must use one of " - f"{list(_map_scalar_type_to_serialiser.keys()) + [np.unicode_]}" + f"{list(_map_scalar_type_to_serialiser.keys()) + [np.str_]}" ) @@ -539,8 +539,8 @@ def _serialise_value( def _decode_if_scalar_string(value: np.ndarray) -> Union[str, np.ndarray]: if value.ndim == 0 and ( - np.issubdtype(value.dtype, np.unicode_) - or np.issubdtype(value.dtype, np.string_) + np.issubdtype(value.dtype, np.str_) + or np.issubdtype(value.dtype, np.bytes_) ): return value.item().decode() return value diff --git a/streaming_data_types/logdata_f144.py b/src/streaming_data_types/logdata_f144.py similarity index 100% rename from streaming_data_types/logdata_f144.py rename to src/streaming_data_types/logdata_f144.py diff --git a/streaming_data_types/nicos_cache_ns10.py b/src/streaming_data_types/nicos_cache_ns10.py similarity index 100% rename from streaming_data_types/nicos_cache_ns10.py rename to src/streaming_data_types/nicos_cache_ns10.py diff --git a/streaming_data_types/readout_data_ar51.py b/src/streaming_data_types/readout_data_ar51.py similarity index 100% rename from streaming_data_types/readout_data_ar51.py rename to src/streaming_data_types/readout_data_ar51.py diff --git a/streaming_data_types/run_start_pl72.py b/src/streaming_data_types/run_start_pl72.py similarity index 100% rename from streaming_data_types/run_start_pl72.py rename to src/streaming_data_types/run_start_pl72.py diff --git a/streaming_data_types/run_stop_6s4t.py b/src/streaming_data_types/run_stop_6s4t.py similarity index 100% rename from streaming_data_types/run_stop_6s4t.py rename to src/streaming_data_types/run_stop_6s4t.py diff --git a/streaming_data_types/sample_environment_senv.py b/src/streaming_data_types/sample_environment_senv.py similarity index 100% rename from streaming_data_types/sample_environment_senv.py rename to src/streaming_data_types/sample_environment_senv.py diff --git a/streaming_data_types/status_x5f2.py b/src/streaming_data_types/status_x5f2.py similarity index 100% rename from streaming_data_types/status_x5f2.py rename to src/streaming_data_types/status_x5f2.py diff --git a/streaming_data_types/timestamps_tdct.py b/src/streaming_data_types/timestamps_tdct.py similarity index 100% rename from streaming_data_types/timestamps_tdct.py rename to src/streaming_data_types/timestamps_tdct.py diff --git a/streaming_data_types/units_un00.py b/src/streaming_data_types/units_un00.py similarity index 100% rename from streaming_data_types/units_un00.py rename to src/streaming_data_types/units_un00.py diff --git a/streaming_data_types/utils.py b/src/streaming_data_types/utils.py similarity index 100% rename from streaming_data_types/utils.py rename to src/streaming_data_types/utils.py diff --git a/streaming_data_types/_version.py b/streaming_data_types/_version.py deleted file mode 100644 index 83ee1a0..0000000 --- a/streaming_data_types/_version.py +++ /dev/null @@ -1,4 +0,0 @@ -# Version is not directly defined in __init__ because that causes all -# run time dependencies to become build-time dependencies when it is -# imported in setup.py -version = "0.27.0" diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 773bb75..0000000 --- a/tox.ini +++ /dev/null @@ -1,15 +0,0 @@ -[tox] -envlist = py38, py39, py310, py311, py312, flake8 -isolated_build = true -skipsdist=true - -[testenv] -deps = - -r{toxinidir}/requirements.txt - -r{toxinidir}/requirements-dev.txt -commands = - python -m pytest {posargs} -o pythonpath= - -[testenv:flake8] -commands = - python -m flake8 tests streaming_data_types