Skip to content

Commit

Permalink
SFA: Use separate CI configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Jan 18, 2025
1 parent 2a285bf commit 0cb373d
Show file tree
Hide file tree
Showing 5 changed files with 167 additions and 7 deletions.
151 changes: 151 additions & 0 deletions .github/workflows/sfa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
---
name: Tests for pueblo.sfa

on:
pull_request: ~
push:
branches: [ main ]

# Allow job to be triggered manually.
workflow_dispatch:

# Run job each night.
schedule:
- cron: '0 3 * * *'

# Cancel in-progress jobs when pushing to the same branch.
concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}

jobs:

sfa-minimal:
name: SFA minimal on Python ${{ matrix.python-version }}

runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: [
"3.8",
"3.13",
]

env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
UV_SYSTEM_PYTHON: true

steps:

- name: Acquire sources
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: x64
cache: 'pip'
cache-dependency-path: 'pyproject.toml'

- name: Set up uv
uses: astral-sh/setup-uv@v5
with:
cache-dependency-glob: |
pyproject.toml
cache-suffix: ${{ matrix.python-version }}
enable-cache: true
version: "latest"

- name: Set up project
run: |
# `setuptools 0.64.0` adds support for editable install hooks (PEP 660).
# https://github.com/pypa/setuptools/blob/main/CHANGES.rst#v6400
uv pip install --upgrade 'setuptools>=64'
# Install package in editable mode.
uv pip install --upgrade --editable='.[develop,test]'
- name: Run linter and software tests
run: |
pytest -m sfa
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
files: ./coverage.xml
flags: sfa-minimal
env_vars: OS,PYTHON
name: codecov-umbrella
fail_ci_if_error: true

sfa-full:
name: SFA full on Python ${{ matrix.python-version }}

runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: [
"3.8",
"3.13",
]

env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
UV_SYSTEM_PYTHON: true

steps:

- name: Acquire sources
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: x64
cache: 'pip'
cache-dependency-path: 'pyproject.toml'

- name: Set up uv
uses: astral-sh/setup-uv@v5
with:
cache-dependency-glob: |
pyproject.toml
cache-suffix: ${{ matrix.python-version }}
enable-cache: true
version: "latest"

- name: Set up project
run: |
# `setuptools 0.64.0` adds support for editable install hooks (PEP 660).
# https://github.com/pypa/setuptools/blob/main/CHANGES.rst#v6400
uv pip install --upgrade 'setuptools>=64'
# Install package in editable mode.
uv pip install --upgrade --editable='.[develop,test,sfa-full]'
- name: Run linter and software tests
run: |
pytest -m sfa
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
files: ./coverage.xml
flags: sfa-full
env_vars: OS,PYTHON
name: codecov-umbrella
fail_ci_if_error: true
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dependencies = [
"contextlib-chdir; python_version<'3.11'",
"importlib-metadata; python_version<'3.8'",
"platformdirs<5",
"tomli<3",
]

optional-dependencies.all = [
Expand Down Expand Up @@ -212,7 +213,7 @@ skip_gitignore = false
[tool.pytest.ini_options]
minversion = "2.0"
addopts = """
-rfEXs -p pytester --strict-markers --verbosity=3
-rsfEX -p pytester --strict-markers --verbosity=3
--cov=pueblo --cov-report=term-missing --cov-report=xml
--ignore=tests/ngr
"""
Expand Down Expand Up @@ -290,7 +291,7 @@ lint = [
{ cmd = "validate-pyproject pyproject.toml" },
{ cmd = "mypy" },
]
test = "pytest -m 'not ngr'"
test = "pytest -m 'not (ngr or sfa)'"
test-full = "pytest"
build = { cmd = "python -m build" }
check = [ "lint", "test" ]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from click.testing import CliRunner

from pueblo.cli import cli


def test_version():
"""
CLI test: Invoke `pueblo --version`
"""
from pueblo.cli import cli

runner = CliRunner()

result = runner.invoke(
Expand Down
6 changes: 4 additions & 2 deletions tests/test_environ.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import pytest

from pueblo.util.environ import getenvpass


@pytest.fixture(scope="function", autouse=True)
def init_testcase():
Expand All @@ -16,12 +14,16 @@ def init_testcase():


def test_getenvpass_prompt(mocker):
from pueblo.util.environ import getenvpass

mocker.patch("getpass.getpass", return_value="foobar")
getenvpass("ACME_API_KEY", "really?", skip_pytest_notebook=False)
assert os.environ.get("ACME_API_KEY") == "foobar"


def test_getenvpass_environ():
from pueblo.util.environ import getenvpass

with mock.patch("getpass.getpass"), mock.patch("pytest.exit") as exit_mock:
getenvpass("ACME_API_KEY", "really?")
assert os.environ.get("ACME_API_KEY") is None
Expand Down
8 changes: 7 additions & 1 deletion tests/test_sfa.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import pytest

pytest.importorskip("attrs")
pytestmark = pytest.mark.sfa


from pueblo.sfa.core import ApplicationAddress, SingleFileApplication # noqa: E402
Expand Down Expand Up @@ -41,6 +41,8 @@ def test_address_url():
],
)
def test_application_api_success(capsys, spec):
if spec.startswith("https:"):
pytest.importorskip("fsspec")
app = SingleFileApplication.from_spec(spec)
app.load()
outcome = app.run()
Expand All @@ -58,6 +60,8 @@ def test_application_api_success(capsys, spec):
],
)
def test_application_api_not_callable(capsys, spec):
if spec.startswith("https:"):
pytest.importorskip("fsspec")
app = SingleFileApplication.from_spec(spec)
with pytest.raises(TypeError) as ex:
app.load()
Expand All @@ -73,6 +77,8 @@ def test_application_api_not_callable(capsys, spec):
],
)
def test_application_cli(mocker, capfd, spec):
if spec.startswith("https:"):
pytest.importorskip("fsspec")
mocker.patch.dict(os.environ, {"PYTHONPATH": str(Path.cwd())})
subprocess.check_call(["sfa", "run", spec])
assert "Räuber Hotzenplotz" in capfd.readouterr().out
Expand Down

0 comments on commit 0cb373d

Please sign in to comment.