Skip to content

Commit

Permalink
Merge branch 'main' into mcknight/2819
Browse files Browse the repository at this point in the history
  • Loading branch information
McKnight-42 authored Jul 31, 2024
2 parents 1003492 + 2854173 commit 23bb6a2
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 9 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,25 @@ updates:
schedule:
interval: "daily"
rebase-strategy: "disabled"
ignore:
- dependency-name: "*"
update-types:
- version-update:semver-patch
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
rebase-strategy: "disabled"
ignore:
- dependency-name: "*"
update-types:
- version-update:semver-patch
- package-ecosystem: "docker"
directory: "/docker"
schedule:
interval: "weekly"
rebase-strategy: "disabled"
ignore:
- dependency-name: "*"
update-types:
- version-update:semver-patch
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
uses: actions/checkout@v4

- name: "Set up Python ${{ matrix.python-version }}"
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release_prep_hatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:

- name: "Parse input version"
id: semver
uses: dbt-labs/actions/[email protected].0
uses: dbt-labs/actions/[email protected].1
with:
version: ${{ inputs.version }}

Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:

steps:
- name: "Checkout ${{ github.event.repository.name }}@${{ needs.release-branch.outputs.name }}"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ needs.release-branch.outputs.name }}

Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:

steps:
- name: "Checkout ${{ github.event.repository.name }}@${{ needs.release-branch.outputs.name }}"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ needs.release-branch.outputs.name }}

Expand Down Expand Up @@ -410,7 +410,7 @@ jobs:
steps:
- name: "Checkout ${{ github.event.repository.name }}"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Merge changes into ${{ inputs.branch }}"
uses: everlytic/[email protected]
Expand Down Expand Up @@ -455,7 +455,7 @@ jobs:
echo "name=$branch" >> $GITHUB_OUTPUT
- name: "Checkout ${{ github.event.repository.name }}@${{ steps.branch.outputs.name }}"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ steps.branch.outputs.name }}

Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ fi

This ensures the version of `psycopg2` will match that of `psycopg2-binary`.


## Contribute

See `CONTRIBUTING.md` for a detailed overview of contributing a code change to this adapter.

## Join the dbt Community

- Be part of the conversation in the [dbt Community Slack](http://community.getdbt.com/)
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ classifiers = [
]
dependencies = [
"psycopg2-binary>=2.9,<3.0",
"dbt-adapters>=0.1.0a1,<2.0",
"dbt-adapters>=1.1.1,<2.0",
# add dbt-core to ensure backwards compatibility of installation, this is not a functional dependency
"dbt-core>=1.8.0a1",
"dbt-core>=1.8.0",
# installed via dbt-adapters but used directly
"dbt-common>=0.1.0a1,<2.0",
"dbt-common>=1.0.4,<2.0",
"agate>=1.0,<2.0",
]
[project.urls]
Expand Down

0 comments on commit 23bb6a2

Please sign in to comment.