Standardised pyproject.toml and adjusted Makefile.

Author: johnbywater

.github/workflows/github-actions.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Poetry
         run: make install-poetry
       - name: Install packages
-        run: make install-packages
+        run: make install
       - name: Start EventStoreDB
         run: make start-eventstoredb
       - name: Lint

Makefile

@@ -15,39 +15,18 @@ install-poetry:
 
 .PHONY: install
 install:
-	$(POETRY) sync  -vv $(opts)
+	$(POETRY) sync --all-extras $(opts)
 
-.PHONY: install-packages
-install-packages:
-	$(POETRY) sync --no-root -vv $(opts)
+.PHONY: update
+update: update-lock install
 
-.PHONY: update-lockfile
-update-lockfile:
-	$(POETRY) lock
+.PHONY: update-lock
+update-lock:
+	$(POETRY) update --lock -v
 
-.PHONY: update-packages
-update-packages: update-lockfile install-packages
 
-
-.PHONY: install-pre-commit-hooks
-install-pre-commit-hooks:
-ifeq ($(opts),)
-	$(POETRY) run pre-commit install
-endif
-
-.PHONY: uninstall-pre-commit-hooks
-uninstall-pre-commit-hooks:
-ifeq ($(opts),)
-	$(POETRY) run pre-commit uninstall
-endif
-
-.PHONY: lock-packages
-lock-packages:
-	$(POETRY) lock -vv --no-update
-
-.PHONY: update-packages
-update-packages:
-	$(POETRY) update -vv
+.PHONY: lint
+lint: lint-python
 
 .PHONY: lint-black
 lint-black:
@@ -68,8 +47,9 @@ lint-mypy:
 .PHONY: lint-python
 lint-python: lint-black lint-flake8 lint-isort lint-mypy
 
-.PHONY: lint
-lint: lint-python
+
+.PHONY: fmt
+fmt: fmt-black fmt-isort
 
 .PHONY: fmt-black
 fmt-black:
@@ -79,8 +59,6 @@ fmt-black:
 fmt-isort:
 	$(POETRY) run isort .
 
-.PHONY: fmt
-fmt: fmt-black fmt-isort
 
 .PHONY: test
 test:

README.md

@@ -372,10 +372,6 @@ Use the Makefile to create a new Poetry virtual environment for the
 project and install the project's package dependencies into it,
 using the following command.
 
-    $ make install-packages
-
-It's also possible to also install the project in 'editable mode'.
-
     $ make install
 
 Please note, if you create the virtual environment in this way, and then try to
@@ -409,7 +405,7 @@ You can reformat the code using the following command.
 
 Tests belong in `./tests`. Code-under-test belongs in `./eventsourcing_eventstoredb`.
 
-Edit package dependencies in `pyproject.toml`. Update installed packages (and the
-`poetry.lock` file) using the following command.
+Edit package dependencies in `pyproject.toml`. Update `poetry.lock` and installed packages
+using the following command.
 
-    $ make update-packages
+    $ make update

poetry.lock

@@ -1,15 +1,26 @@
-[tool.poetry]
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
 name = "eventsourcing-eventstoredb"
-version = "1.2.0b3"
+version = "1.2.0b4"
+dependencies = [
+  "eventsourcing>=9.4.1,<10.0",
+  "kurrentdbclient>=1.0.2,<2.0",
+]
 description = "Python package for eventsourcing with EventStoreDB"
+license = { text = "BSD-3-Clause" }
+readme = "README.md"
+requires-python = ">=3.9.2"
 authors = [
-    "John Bywater <john.bywater@appropriatesoftware.net>",
+    { "name" = "John Bywater", "email" = "john.bywater@appropriatesoftware.net" },
 ]
-license = "BSD 3-Clause"
 classifiers = [
 #    "Development Status :: 3 - Alpha",
     "Development Status :: 4 - Beta",
 #    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
@@ -18,24 +29,20 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-readme = "README.md"
+
+[project.urls]
 homepage = "https://github.com/pyeventsourcing/eventsourcing-eventstoredb"
 repository = "https://github.com/pyeventsourcing/eventsourcing-eventstoredb"
-include = ["eventsourcing_eventstoredb/py.typed"]
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0,!=3.9.0,!=3.9.1"
-eventsourcing = { version = "9.4.0b2" }
-#eventsourcing = { path = "../eventsourcing/", develop = true }
-#esdbclient = { path = "../esdbclient/", develop = true }
-kurrentdbclient = { version = "1.0" }
 
+[tool.poetry]
+include = ["eventsourcing_eventstoredb/py.typed"]
 
 [tool.poetry.group.dev.dependencies]
 black = { version = "*", allow-prereleases = true }
 flake8 = "*"
-flake8-broken-line = "*"
+flake8-broken-line = { version = "*", python = ">=3.9.2,<4.0"}
 flake8-bugbear = "*"
 flake8-coding = "*"
 flake8-isort = "*"
@@ -49,10 +56,6 @@ pytest-cov = "*"
 pycryptodome = "*"
 types-protobuf = "*"
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
 [tool.black]
 line-length = 88
 target-version = ["py38"]