Merge pull request #13 from punch-mission/develop

Fix pydantic validation

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

punchpipe/__init__.py

@@ -1,16 +1,4 @@
-# version stuff copied from https://stackoverflow.com/a/17638236
-from pkg_resources import get_distribution, DistributionNotFound
-import os.path
+# version guidance from https://stackoverflow.com/a/56331414
+from importlib.metadata import version
 
-try:
-    _dist = get_distribution('punchpipe')
-    # Normalize case for Windows systems
-    dist_loc = os.path.normcase(_dist.location)
-    here = os.path.normcase(__file__)
-    if not here.startswith(os.path.join(dist_loc, 'punchpipe')):
-        # not installed, but there is another version that *is*
-        raise DistributionNotFound
-except DistributionNotFound:
-    __version__ = 'Please install punchpipe project with setup.py'
-else:
-    __version__ = _dist.version
+__version__ = version("punchpipe")

punchpipe/controlsegment/tests/conftest.py

@@ -0,0 +1,7 @@
+import pytest
+from pytest_mock_resources import MysqlConfig
+
+
+@pytest.fixture(scope='session')
+def pmr_mysql_config():
+    return MysqlConfig(image='mariadb:latest')

punchpipe/flows/tests/conftest.py

@@ -0,0 +1,7 @@
+import pytest
+from pytest_mock_resources import MysqlConfig
+
+
+@pytest.fixture(scope='session')
+def pmr_mysql_config():
+    return MysqlConfig(image='mariadb:latest')

requirements.txt

@@ -1,6 +1,6 @@
-git+ssh://[email protected]/punch-mission/punchbowl.git#egg=punchbowl
 prefect
-pydantic
+git+ssh://[email protected]/punch-mission/punchbowl.git#egg=punchbowl
+pydantic==1.10.12
 pymysql
 sqlalchemy
 pyyaml

setup.py

@@ -20,7 +20,7 @@
     install_requires=[
         'prefect',
         'pymysql',
-        'pydantic',
+        'pydantic==1.10.12',
         'sqlalchemy',
         'punchbowl',
         'datapane',