Merge branch 'main' into rlamb/o11y-265/add-plugin-support

Author: kinyoklion

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
       - uses: ./.github/actions/build-docs
 
       - name: Run tests
-        run: make test
+        run: make test-all
 
       - name: Verify typehints
         run: make lint
@@ -124,4 +124,4 @@ jobs:
         run: poetry install --all-extras
 
       - name: Run tests
-        run: make test
+        run: make test-all

CONTRIBUTING.md

@@ -16,11 +16,11 @@ We encourage pull requests and other contributions from the community. Before su
 
 This project is built using [poetry](https://python-poetry.org/). To learn more about the basics of working with this tool, read [Poetry's basic usage guide](https://python-poetry.org/docs/basic-usage/).
 
-To begin development, active the poetry shell and ensure your dependencies are installed.
+To begin development, ensure your dependencies are installed and (optionally) activate the virtualenv.
 
 ```
-poetry shell
 poetry install
+eval $(poetry env activate)
 ```
 
 This library defines several extra dependencies to optionally enhance the SDK's capabilities. Use the following commands to install one or more of the available extras.

Makefile

@@ -28,6 +28,11 @@ install:
 .PHONY: test
 test: #! Run unit tests
 test: install
+	@LD_SKIP_DATABASE_TESTS=1 poetry run pytest $(PYTEST_FLAGS)
+
+.PHONY: test-all
+test-all: #! Run unit tests (including database integrations)
+test-all: install
 	@poetry run pytest $(PYTEST_FLAGS)
 
 .PHONY: lint

ldclient/plugin.py

@@ -32,7 +32,7 @@ class EnvironmentMetadata:
     """
     sdk: SdkMetadata  #: Information about the SDK
     application: Optional[ApplicationMetadata] = None  #: Information about the application
-    sdk_key: str = None  #: The SDK key used to initialize the SDK
+    sdk_key: str  #: The SDK key used to initialize the SDK
 
 
 @dataclass(kw_only=True)