Revert "Updating pyproject.toml and removing reqs"

This reverts commit 7a1b290.

Author: davidpcls

.github/workflows/docs.yml

@@ -33,7 +33,7 @@ jobs:
         popd
 
         pip install .
-        pip install ".[dev]"
+        pip install -r requirements-dev.txt
         pip list
     - name: Build Docs
       run: |

.github/workflows/docs_publish.yml

@@ -45,7 +45,7 @@ jobs:
         popd
 
         pip install .
-        pip install ".[dev]"
+        pip install -r requirements-dev.txt
         pip list
     - name: Build Docs
       run: |

.github/workflows/pre-commit.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Install dev dependencies
         run: |
           set -vxeuo pipefail
-          pip install ".[dev]"
+          pip install -r requirements-dev.txt
           python -m pip list
 
       - name: Run pre-commit

.github/workflows/testing.yml

@@ -58,7 +58,7 @@ jobs:
 
         pip install --upgrade pip
         pip install .
-        pip install ".[dev]"
+        pip install -r requirements-dev.txt
         # pip install "pydantic${{ matrix.pydantic-version }}"
         # pip install bluesky==1.11.0
 

MANIFEST.in

@@ -2,6 +2,8 @@ include AUTHORS.rst
 include CONTRIBUTING.rst
 include LICENSE
 include README.rst
+include requirements.txt
+
 include bluesky_httpserver/database/alembic.ini.template
 include bluesky_httpserver/database/migrations/env.py
 include bluesky_httpserver/database/migrations/script.py.mako

continuous_integration/dockerfiles/test.Dockerfile

@@ -13,13 +13,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 WORKDIR /workspace
 
+COPY requirements.txt requirements-dev.txt ./
 COPY pyproject.toml setup.py setup.cfg MANIFEST.in versioneer.py README.rst AUTHORS.rst LICENSE ./
 COPY bluesky_httpserver ./bluesky_httpserver
 
 RUN python -m pip install --upgrade pip setuptools wheel numpy && \
     python -m pip install git+https://github.com/bluesky/bluesky-queueserver.git && \
     python -m pip install git+https://github.com/bluesky/bluesky-queueserver-api.git && \
-    python -m pip install ".[dev]"
+    python -m pip install -r requirements-dev.txt && \
+    python -m pip install .
 
 COPY scripts/docker/run_shard_in_container.sh /usr/local/bin/run_shard_in_container.sh
 RUN chmod +x /usr/local/bin/run_shard_in_container.sh

docs/source/contributing.rst

@@ -98,7 +98,7 @@ Install the HTTP Server in editable mode::
 
 Install development dependencies::
 
-  $ pip install -e ".[dev]"
+  $ pip install -r requirements-dev.txt
 
 
 Setting up `pre-commit`

pyproject.toml

@@ -1,76 +1,3 @@
-[build-system]
-requires = ["setuptools>=64", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "bluesky-httpserver"
-dynamic = ["version"]
-description = "HTTP Server for communicating with Bluesky Queue Server"
-readme = "README.rst"
-requires-python = ">=3.7"
-license = "BSD-3-Clause"
-authors = [{ name = "Brookhaven National Laboratory" }]
-classifiers = [
-  "Development Status :: 2 - Pre-Alpha",
-  "Natural Language :: English",
-  "Programming Language :: Python :: 3",
-]
-dependencies = [
-  "alembic",
-  "bluesky-queueserver",
-  "bluesky-queueserver-api",
-  "cachetools",
-  "fastapi",
-  "httpx",
-  "ldap3",
-  "orjson",
-  "pamela",
-  "pydantic",
-  "pydantic-settings",
-  "python-jose",
-  "pyzmq",
-  "sqlalchemy",
-  "starlette",
-  "typing-extensions; python_version < '3.8'",
-  "uvicorn",
-]
-
-[project.optional-dependencies]
-dev = [
-  "black",
-  "codecov",
-  "coverage",
-  "cryptography",
-  "fastapi[all]",
-  "flake8",
-  "ipython",
-  "isort",
-  "matplotlib",
-  "numpydoc",
-  "pandas",
-  "pre-commit",
-  "py",
-  "pytest",
-  "pytest-asyncio",
-  "pytest-xprocess",
-  "requests",
-  "respx",
-  "sphinx",
-  "sphinx_rtd_theme",
-]
-
-[project.scripts]
-start-bluesky-httpserver = "bluesky_httpserver.server:start_server"
-
-[tool.setuptools]
-include-package-data = true
-
-[tool.setuptools.packages.find]
-exclude = ["docs", "tests"]
-
-[tool.setuptools.dynamic]
-version = { attr = "bluesky_httpserver.__version__" }
-
 [tool.black]
 line-length = 115
 target-version = ['py37']

requirements-dev.txt

@@ -0,0 +1,23 @@
+# These are required for developing the package (running the tests, building
+# the documentation) but not necessarily required for _using_ it.
+black
+codecov
+coverage
+cryptography
+fastapi[all]
+flake8
+isort
+pre-commit
+pytest
+pytest-asyncio
+pytest-xprocess
+py
+respx
+sphinx
+ipython
+numpydoc
+matplotlib
+pandas
+sphinx
+sphinx_rtd_theme
+requests

requirements.txt

@@ -0,0 +1,17 @@
+alembic
+bluesky-queueserver
+bluesky-queueserver-api
+cachetools
+fastapi
+httpx
+ldap3
+orjson
+pamela
+pydantic
+pydantic-settings
+python-jose
+pyzmq
+sqlalchemy
+starlette
+typing-extensions;python_version<'3.8'
+uvicorn