From a746bdabfeed31df6288f9b6c6a73ed17fbf0fca Mon Sep 17 00:00:00 2001
From: Marcus Hughes <hughes.jmb@gmail.com>
Date: Tue, 8 Aug 2023 17:35:24 -0600
Subject: [PATCH 1/6] Create dependabot.yml
---
.github/dependabot.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 .github/dependabot.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..91abb11
--- /dev/null
+++ b/.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"
From 92f056c81568b1270f641751f0ba6d3919ec856c Mon Sep 17 00:00:00 2001
From: jmbhughes <z*5@2!lSBjO1>
Date: Tue, 26 Sep 2023 10:40:36 -0600
Subject: [PATCH 2/6] sets mariadb as db
---
punchpipe/controlsegment/tests/conftest.py | 7 +++++++
punchpipe/flows/tests/conftest.py | 7 +++++++
2 files changed, 14 insertions(+)
create mode 100644 punchpipe/controlsegment/tests/conftest.py
create mode 100644 punchpipe/flows/tests/conftest.py
diff --git a/punchpipe/controlsegment/tests/conftest.py b/punchpipe/controlsegment/tests/conftest.py
new file mode 100644
index 0000000..5acfa6f
--- /dev/null
+++ b/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')
\ No newline at end of file
diff --git a/punchpipe/flows/tests/conftest.py b/punchpipe/flows/tests/conftest.py
new file mode 100644
index 0000000..5acfa6f
--- /dev/null
+++ b/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')
\ No newline at end of file
From d862fbcfe8c9197fc7049a576114061f5ab85b17 Mon Sep 17 00:00:00 2001
From: Marcus Hughes <hughes.jmb@gmail.com>
Date: Tue, 26 Sep 2023 10:52:45 -0600
Subject: [PATCH 3/6] installs editable
---
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8903a21..f229514 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,7 +38,7 @@ jobs:
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
- pip install .
+ pip install -e .
pytest --cov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
From 27bd8dfc0677ce1a43090f54cf13c89627a69886 Mon Sep 17 00:00:00 2001
From: jmbhughes <z*5@2!lSBjO1>
Date: Tue, 26 Sep 2023 12:01:59 -0600
Subject: [PATCH 4/6] changes version retrieval
---
punchpipe/__init__.py | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/punchpipe/__init__.py b/punchpipe/__init__.py
index 990b741..bc7806c 100644
--- a/punchpipe/__init__.py
+++ b/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
\ No newline at end of file
+__version__ = version("punchpipe")
From e3c6a835c11fe5292c83ba8453a94831608f30c8 Mon Sep 17 00:00:00 2001
From: jmbhughes <z*5@2!lSBjO1>
Date: Tue, 26 Sep 2023 12:02:32 -0600
Subject: [PATCH 5/6] reverts editable install
---
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f229514..8903a21 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,7 +38,7 @@ jobs:
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
- pip install -e .
+ pip install .
pytest --cov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
From a0958822bffc61f381edf4103ef3e671f800e6c7 Mon Sep 17 00:00:00 2001
From: Marcus Hughes <hughes.jmb@gmail.com>
Date: Mon, 16 Oct 2023 08:16:28 -0600
Subject: [PATCH 6/6] pin pydantic to avoid #11
---
requirements.txt | 4 ++--
setup.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 0959d67..3e06c09 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-git+ssh://git@github.com/punch-mission/punchbowl.git#egg=punchbowl
prefect
-pydantic
+git+ssh://git@github.com/punch-mission/punchbowl.git#egg=punchbowl
+pydantic==1.10.12
pymysql
sqlalchemy
pyyaml
diff --git a/setup.py b/setup.py
index f95448d..809053f 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
install_requires=[
'prefect',
'pymysql',
- 'pydantic',
+ 'pydantic==1.10.12',
'sqlalchemy',
'punchbowl',
'datapane',