From 2e05b51ca6cae3d5885315830f2f5d48ff732701 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Sat, 4 Feb 2023 14:30:01 +0100 Subject: [PATCH 1/3] Add dependabot for github actions. Committed via https://github.com/asottile/all-repos --- .github/dependabot.yml | 7 +++++++ .github/workflows/main.yml | 2 +- .github/workflows/publish-to-pypi.yml | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..718572b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 + +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e6b29ef..4c7e3e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: python-version: ['3.7', '3.8', '3.9', '3.10'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-tinytex@v1 - uses: conda-incubator/setup-miniconda@v2 with: diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index cef64ee..7d30ad9 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,10 +7,10 @@ jobs: name: Build and publish Python 🐍 distributions 📦 to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.8 From 2c0822be17c7885bbaf8d6cbed291ac0f8ce8ef1 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Fri, 10 Feb 2023 12:13:18 +0100 Subject: [PATCH 2/3] Update database.py --- src/pytask_environment/database.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pytask_environment/database.py b/src/pytask_environment/database.py index 8cbdd88..8896982 100644 --- a/src/pytask_environment/database.py +++ b/src/pytask_environment/database.py @@ -2,7 +2,11 @@ from __future__ import annotations from pony import orm -from pytask import db + +try: + from pytask import db +except ImportError: + from _pytask.database import db class Environment(db.Entity): From bfe2883ff958cd192cea75ddb4f5e3cfa2b8b90e Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Fri, 10 Feb 2023 12:14:00 +0100 Subject: [PATCH 3/3] Update database.py --- src/pytask_environment/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytask_environment/database.py b/src/pytask_environment/database.py index 8896982..82ad599 100644 --- a/src/pytask_environment/database.py +++ b/src/pytask_environment/database.py @@ -6,7 +6,7 @@ try: from pytask import db except ImportError: - from _pytask.database import db + from _pytask.database_utils import db class Environment(db.Entity):