From 0638bb481842d24afc214d6d7336a581e6982c8f Mon Sep 17 00:00:00 2001 From: John Andersen Date: Tue, 25 Jul 2023 23:17:32 +0000 Subject: [PATCH] service: activitypub-webhook-relay: Fix package install by fixing version to not use setuptools_scm while in monorepo Related: https://github.com/pypa/setuptools_scm/blob/e9cbb5a68b3ae6d5c549bda293ef60bb5ec8ec7e/src/setuptools_scm/_integration/pyproject_reading.py#L68-L73 Related: https://github.com/intel/dffml/issues/1315 Signed-off-by: John Andersen --- .../activitypub-webhook-relay/CONTRIBUTING.rst | 15 +++++++++++++++ .../activitypub_webhook_relay/version.py | 1 + service/activitypub-webhook-relay/pyproject.toml | 2 -- service/activitypub-webhook-relay/setup.cfg | 5 ++--- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 service/activitypub-webhook-relay/CONTRIBUTING.rst create mode 100644 service/activitypub-webhook-relay/activitypub_webhook_relay/version.py diff --git a/service/activitypub-webhook-relay/CONTRIBUTING.rst b/service/activitypub-webhook-relay/CONTRIBUTING.rst new file mode 100644 index 0000000000..4297b798a7 --- /dev/null +++ b/service/activitypub-webhook-relay/CONTRIBUTING.rst @@ -0,0 +1,15 @@ +CONTRIBUTING +============ + +Create new virtual environment + +.. code-block:: console + + $ python -m venv .venv + $ . .venv/bin/activate + +Install in development mode + +.. code-block:: console + + $ pip install -e .[dev] ../../ diff --git a/service/activitypub-webhook-relay/activitypub_webhook_relay/version.py b/service/activitypub-webhook-relay/activitypub_webhook_relay/version.py new file mode 100644 index 0000000000..7723ca46a5 --- /dev/null +++ b/service/activitypub-webhook-relay/activitypub_webhook_relay/version.py @@ -0,0 +1 @@ +VERSION = "0.0.0" diff --git a/service/activitypub-webhook-relay/pyproject.toml b/service/activitypub-webhook-relay/pyproject.toml index 17b1235941..3ba7736eac 100644 --- a/service/activitypub-webhook-relay/pyproject.toml +++ b/service/activitypub-webhook-relay/pyproject.toml @@ -1,8 +1,6 @@ requires = ["setuptools>=44", "wheel", "setuptools_scm[toml]>=3.4.3"] build-backend = "setuptools.build_meta" -[tool.setuptools_scm] - [tool.black] exclude = ''' ( diff --git a/service/activitypub-webhook-relay/setup.cfg b/service/activitypub-webhook-relay/setup.cfg index 90fbe9aea0..5bafd8fb65 100644 --- a/service/activitypub-webhook-relay/setup.cfg +++ b/service/activitypub-webhook-relay/setup.cfg @@ -1,6 +1,7 @@ [metadata] name = activitypub-webhook-relay -description = DFFML blank activitypub-webhook-relay +description = DFFML service activitypub-webhook-relay +version = attr: activitypub_webhook_relay.version.VERSION long_description = file: README.rst author = Unknown author_email = unknown@example.com @@ -25,8 +26,6 @@ zip_safe = False include_package_data = True packages = find: # entry_points = file: entry_points.txt -setup_requires = - setuptools_scm[toml]>=3.4.3 install_requires = quart tomli_w