Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dalibo/pg_activity
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d05d2a9cdb8c6bf8a2efd8040855d755e15970ef
Choose a base ref
..
head repository: dalibo/pg_activity
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31fc6a4eb74021ecc69fb2b1fd21b644a1317448
Choose a head ref
Showing with 18 additions and 8 deletions.
  1. +8 −0 .github/dependabot.yml
  2. +2 −2 .github/workflows/lint.yml
  3. +2 −2 .github/workflows/publish.yml
  4. +4 −4 .github/workflows/tests.yml
  5. +2 −0 tox.ini
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install tox
run: pip install tox
- name: Check manifest
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ jobs:
- python: "3.12"
psycopg: "psycopg3"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install tox
@@ -25,6 +25,6 @@ jobs:
sudo locale-gen fr_FR zh_TW.EUC-TW
sudo update-locale
- name: Install dependencies for Pyperclip
run: sudo apt-get -y install --no-install-recommends xclip
run: sudo apt-get -y install --no-install-recommends xsel
- name: Test
run: tox -e py-${{ matrix.psycopg }}
run: DISPLAY=:0 tox -e py-${{ matrix.psycopg }}
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ extras =
psycopg3: psycopg
commands =
pytest {posargs:-vv -ra}
passenv =
DISPLAY
setenv =
psycopg2: _PGACTIVITY_USE_PSYCOPG2=1
usedevelop = true