From ce564c477ad75c48be4f4a5318047f22e2a305ef Mon Sep 17 00:00:00 2001 From: David Pastl Date: Tue, 4 Aug 2026 08:36:51 -0600 Subject: [PATCH 1/2] Removing some unnecesary changes --- bluesky_queueserver_api/tests/test_api.py | 7 +-- docs/source/installation.rst | 47 -------------- pyproject.toml | 74 ----------------------- 3 files changed, 1 insertion(+), 127 deletions(-) diff --git a/bluesky_queueserver_api/tests/test_api.py b/bluesky_queueserver_api/tests/test_api.py index 1b1815f..d988641 100644 --- a/bluesky_queueserver_api/tests/test_api.py +++ b/bluesky_queueserver_api/tests/test_api.py @@ -29,12 +29,7 @@ _user, _user_group = "Test User", default_user_group _plan1 = {"name": "count", "args": [["det1", "det2"]], "item_type": "plan"} -_plan3 = { - "name": "count", - "args": [["det1", "det2"]], - "kwargs": {"num": 5, "delay": 1}, - "item_type": "plan", -} +_plan3 = {"name": "count", "args": [["det1", "det2"]], "kwargs": {"num": 5, "delay": 1}, "item_type": "plan"} # fmt: off diff --git a/docs/source/installation.rst b/docs/source/installation.rst index defb8d7..1b4dada 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -2,9 +2,6 @@ Installation ============ -Installation from PyPI -====================== - Installation from PyPI:: $ pip install bluesky-queueserver-api @@ -12,47 +9,3 @@ Installation from PyPI:: Installation from `conda-forge`:: $ conda install bluesky-queueserver-api -c conda-forge - -Build and link from source -========================== - -Build distribution artifacts ----------------------------- - -From a local checkout, build source and wheel distributions: - -.. code-block:: bash - - cd bluesky-queueserver-api - uv build - -The resulting files are created in ``dist/``. - -You can also build with ``pip`` tooling: - -.. code-block:: bash - - cd bluesky-queueserver-api - python -m pip install --upgrade build - python -m build - - -Install or link a local checkout --------------------------------- - -Install this package in editable mode from the repository root: - -.. code-block:: bash - - cd bluesky-queueserver-api - python -m pip install -e . - -From another project, link to this repository as a local editable dependency -using ``uv``: - -.. code-block:: bash - - uv add --editable ../bluesky-queueserver-api - -Note: the directory name uses hyphens (``bluesky-queueserver-api``), not -underscores. diff --git a/pyproject.toml b/pyproject.toml index 0cd2fe4..b80acea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,77 +1,3 @@ -[build-system] -requires = ["setuptools>=64", "wheel", "versioneer"] -build-backend = "setuptools.build_meta" - -[project] -name = "bluesky-queueserver-api" -description = "Python API for Bluesky Queue Server" -readme = "README.rst" -requires-python = ">=3.7" -license = "BSD-3-Clause" -authors = [{ name = "Brookhaven National Laboratory" }] -dynamic = ["version"] -classifiers = [ - "Development Status :: 2 - Pre-Alpha", - "Natural Language :: English", - "Programming Language :: Python :: 3", -] -dependencies = [ - "bluesky-queueserver", - "websockets", - "httpx", -] - -[project.urls] -Homepage = "https://github.com/bluesky/bluesky-queueserver-api" - -[project.optional-dependencies] -dev = [ - "codecov", - "coverage", - "flake8", - "pre-commit", - "pytest", - "pytest-cov", - "pytest-xprocess", - "pytest-split", - "py", - "sphinx", - "twine", - "black", - "isort", - "nbstripout", - "ipython", - "matplotlib", - "numpydoc", - "pandas", - "sphinx-copybutton", - "sphinx_rtd_theme", - "bluesky-httpserver", -] - -[tool.setuptools.packages.find] -exclude = ["docs", "tests"] - -[tool.pixi.workspace] -channels = ["conda-forge"] -platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"] - -[tool.pixi.pypi-dependencies] -bluesky-queueserver-api = { path = ".", editable = true } - -[tool.pixi.feature.dev.pypi-dependencies] -bluesky-queueserver-api = { path = ".", editable = true, extras = ["dev"] } - -[tool.pixi.environments] -default = { features = ["dev"] } - -[tool.versioneer] -VCS = "git" -style = "pep440-post" -versionfile_source = "bluesky_queueserver_api/_version.py" -versionfile_build = "bluesky_queueserver_api/_version.py" -tag_prefix = "v" - [tool.black] line-length = 115 target-version = ['py310'] From 0d79823a93e08b7ed7f417d1a7ff9becb66e6187 Mon Sep 17 00:00:00 2001 From: David Pastl Date: Tue, 4 Aug 2026 09:45:33 -0600 Subject: [PATCH 2/2] Adding in requirements from bluesky-httpserver --- requirements-dev.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index 521b90a..13ed129 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,6 +15,12 @@ pre-commit black isort nbstripout +# Required for Unit tests against bluesky-httpserver +respx +cryptography +pytest-asyncio +cachetools + # These are dependencies of various sphinx extensions for documentation. ipython matplotlib