Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Python CI

on:
push:
branches:
- '**'
pull_request:

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4

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

- name: Install uv
uses: astral-sh/setup-uv@v4
with:
enable-cache: true

- name: Install dependencies
run: uv sync --all-extras

- name: Run linting
run: uv run ruff check .

- name: Run tests
run: uv run pytest
37 changes: 37 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Python Deployment

on:
push:
tags:
- '*'

jobs:
deploy:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.12"]
steps:
- uses: actions/checkout@v4

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

- name: Install uv
uses: astral-sh/setup-uv@v4

- name: Install dependencies
run: uv sync --all-extras

- name: Run tests
run: uv run pytest

- name: Build package
run: uv build

- name: Publish to PyPI
run: uv publish
env:
UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
23 changes: 23 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Close inactive issues
on:
schedule:
- cron: "30 1 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v5
with:
days-before-issue-stale: 365
days-before-issue-close: 14
exempt-issue-labels: "pinned, security"
stale-issue-label: "stale"
stale-issue-message: "This issue is stale because it has been open for a year with no activity. It will be closed if no further activity occurs. Thank you for your contributions."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale. Feel free to re-open it if it is still relevant."
days-before-pr-stale: -1
days-before-pr-close: -1
repo-token: ${{ secrets.GITHUB_TOKEN }}
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ coverage
*.sln
*.sw?

.serena/
# VSCode
.history
__pycache__

debug.py
.serena/
plans/
.venv/
46 changes: 46 additions & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Ruff configuration file

# Exclude a variety of commonly ignored directories.
extend-exclude = [
"__pycache__",
".git",
".venv",
".eggs",
".nox",
".tox",
".svn",
".hg",
"build",
"dist",
".mypy_cache",
".pytest_cache",
]

# Assume Python 3.10.
target-version = "py310"

# Line length with preview to format
line-length = 120
preview = true

[lint]
# Enable flake8-bugbear rules
select = [
"E", # pycodestyle errors
"W", # pycodestyle warnings
"F", # pyflakes
"B", # flake8-bugbear
"C4", # flake8-comprehensions
"UP", # pyupgrade
"SIM", # flake8-simplify
]

# Allow autofix for all enabled rules (when `--fix`) is provided.
fixable = ["ALL"]

# Ignore B008 for Typer - typer.Option in argument defaults is standard Typer practice
# Ignore E501 - long lines in help text are acceptable
ignore = ["B008", "E501"]

# Allow unused variables when underscore-prefixed.
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
23 changes: 17 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
install:
uv sync
uv sync --all-extras

test:
uv run pytest
uv run --all-extras pytest

lint:
uv run ruff check .

fix:
uv run ruff check . --fix

format:
uv run ruff format .

check: format fix

build:
uv build

publish:
uv publish

clean:
rm -rf dist

local-install:
local-install: clean build
pip install ./dist/datashield-*.tar.gz

local-install-force: clean build
pip install ./dist/datashield-*.tar.gz --break-system-packages
9 changes: 7 additions & 2 deletions datashield/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
from datashield.interface import DSConnection, DSLoginInfo, DSDriver, DSError
from datashield.api import DSLoginBuilder, DSSession
from datashield.interface import (
DSConnection as DSConnection,
DSLoginInfo as DSLoginInfo,
DSDriver as DSDriver,
DSError as DSError,
)
from datashield.api import DSLoginBuilder as DSLoginBuilder, DSSession as DSSession
Loading
Loading