Merge pull request 'initial-commit-fix-CI' (#1) from initial-commit-fix-CI into main
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
@@ -16,25 +16,26 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv pip install --group dev --system
|
env:
|
||||||
|
UV_LINK_MODE: copy
|
||||||
|
run: uv sync
|
||||||
|
|
||||||
- name: Ruff lint
|
- name: Ruff lint
|
||||||
run: ruff check .
|
run: uv run ruff check .
|
||||||
|
|
||||||
- name: Ruff format
|
- name: Ruff format
|
||||||
run: ruff format --check .
|
run: uv run ruff format --check .
|
||||||
|
|
||||||
- name: Pyupgrade check
|
- name: Pyupgrade check
|
||||||
run: pyupgrade --py313-plus $(git ls-files '*.py') && git diff --exit-code
|
run: uv run pyupgrade --py313-plus $(git ls-files '*.py') && git diff --exit-code
|
||||||
|
|
||||||
- name: Install prettier
|
|
||||||
run: npm install --save-dev --save-exact prettier
|
|
||||||
|
|
||||||
- name: Prettier format
|
- name: Prettier format
|
||||||
run: npx prettier --check .
|
run: |
|
||||||
|
npm install --save-dev --save-exact prettier
|
||||||
|
npx prettier --check .
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
renovate-like:
|
update-check:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv and pip-review
|
- name: Install uv and pip-review
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
@@ -31,7 +31,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build package
|
- name: Build package
|
||||||
run: |
|
run: |
|
||||||
uv pip install build --system
|
uv sync --no-dev
|
||||||
uv build
|
uv build
|
||||||
|
|
||||||
- name: Publish to Gitea Package Registry
|
- name: Publish to Gitea Package Registry
|
||||||
|
|||||||
@@ -15,16 +15,15 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|
||||||
- name: Install safety
|
|
||||||
run: pip install safety
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv pip install --group dev --system
|
env:
|
||||||
|
UV_LINK_MODE: copy
|
||||||
|
run: uv sync
|
||||||
|
|
||||||
- name: Run safety check
|
- name: Run safety check
|
||||||
run: safety check
|
run: uv run safety check
|
||||||
|
|||||||
@@ -13,14 +13,11 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
|
||||||
ref: ${{ github.event.workflow_run.head_branch }}
|
|
||||||
token: ${{ secrets.CI_RUNNER_TOKEN }}
|
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Configure git
|
- name: Configure git
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -16,15 +16,17 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv pip install --group dev --system
|
env:
|
||||||
|
UV_LINK_MODE: copy
|
||||||
|
run: uv sync
|
||||||
|
|
||||||
- name: Run pytest
|
- name: Run pytest
|
||||||
env:
|
env:
|
||||||
PYTHONPATH: .
|
PYTHONPATH: .
|
||||||
run: pytest
|
run: uv run pytest
|
||||||
|
|||||||
@@ -16,13 +16,15 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ vars.PYTHON_VERSION }}
|
python-version: ${{ inputs.python-version }}
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv pip install --group dev --system
|
env:
|
||||||
|
UV_LINK_MODE: copy
|
||||||
|
run: uv sync
|
||||||
|
|
||||||
- name: Run mypy
|
- name: Run mypy
|
||||||
run: mypy monitor_utils
|
run: uv run mypy .
|
||||||
|
|||||||
@@ -7,6 +7,15 @@ __pycache__/
|
|||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
|
|
||||||
|
# Node.js/npm
|
||||||
|
node_modules/
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
.npm
|
||||||
|
.yarn-integrity
|
||||||
|
package-lock.json
|
||||||
|
|
||||||
# Distribution / packaging
|
# Distribution / packaging
|
||||||
.Python
|
.Python
|
||||||
build/
|
build/
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
# python-utils
|
# python-utils
|
||||||
|
|
||||||
Various basic python utility functions exposed as a python package.
|
Various basic python utility functions exposed as a python package.
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
def main():
|
|
||||||
print("Hello from python-utils!")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -22,4 +22,27 @@ dev = [
|
|||||||
"pytest>=8.4.1",
|
"pytest>=8.4.1",
|
||||||
"pyupgrade>=3.20.0",
|
"pyupgrade>=3.20.0",
|
||||||
"ruff>=0.12.10",
|
"ruff>=0.12.10",
|
||||||
|
"safety>=3.6.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[tool.uv.index]]
|
||||||
|
name = "private-cache"
|
||||||
|
url = "http://10.0.0.2:5001/index/"
|
||||||
|
default = true
|
||||||
|
|
||||||
|
[tool.mypy]
|
||||||
|
python_version = "3.10"
|
||||||
|
warn_return_any = true # nudge to use stricter types
|
||||||
|
warn_unused_configs = true # nudge to remove unused configs
|
||||||
|
disallow_untyped_defs = true # disallow untyped function definitions
|
||||||
|
disallow_incomplete_defs = true # ensure all parts of a function has type annotation
|
||||||
|
check_untyped_defs = true # dont skip untyped functions
|
||||||
|
disallow_untyped_decorators = false # allow untyped decorators to keep code more readable
|
||||||
|
no_implicit_optional = true # disallow implicit optional types leading to None-mess
|
||||||
|
warn_redundant_casts = true # nudge to use explicit type casts
|
||||||
|
warn_unused_ignores = true # nudge to remove unused ignores
|
||||||
|
warn_no_return = true # catch missing return statements
|
||||||
|
warn_unreachable = true # catch unreachable code
|
||||||
|
show_error_codes = true # show error codes in output
|
||||||
|
explicit_package_bases = true # reduce risk of import confusion
|
||||||
|
namespace_packages = true # enable namespace packages
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
from .check_env import check_env as check_env
|
||||||
|
from .readable_unit import readable_unit as readable_unit
|
||||||
|
|
||||||
|
__all__ = ["check_env", "readable_unit"]
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import os
|
|||||||
|
|
||||||
|
|
||||||
def check_env(
|
def check_env(
|
||||||
var_list: str | list[str],
|
var_list: str | set[str] | list[str] | tuple[str, ...],
|
||||||
missing_ok: bool = False,
|
missing_ok: bool = False,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Check if environment variables are set.
|
"""Check if environment variables are set.
|
||||||
|
|||||||
@@ -3,12 +3,15 @@
|
|||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from pytohn_utils import check_env
|
from python_utils import check_env
|
||||||
|
|
||||||
|
|
||||||
class TestCheckEnv(unittest.TestCase):
|
class TestCheckEnv(unittest.TestCase):
|
||||||
|
set_vars: list[str]
|
||||||
|
unset_var: str
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def setUpClass(cls):
|
def setUpClass(cls) -> None:
|
||||||
"""Set up test environment variables."""
|
"""Set up test environment variables."""
|
||||||
cls.set_vars = ["A", "B", "C"]
|
cls.set_vars = ["A", "B", "C"]
|
||||||
for var in cls.set_vars:
|
for var in cls.set_vars:
|
||||||
@@ -20,41 +23,41 @@ class TestCheckEnv(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def tearDownClass(cls):
|
def tearDownClass(cls) -> None:
|
||||||
for var in cls.set_vars:
|
for var in cls.set_vars:
|
||||||
if var in os.environ:
|
if var in os.environ:
|
||||||
del os.environ[var]
|
del os.environ[var]
|
||||||
os.environ.pop(var, None)
|
os.environ.pop(var, None)
|
||||||
|
|
||||||
def test_check_env_accepts_single_string(self):
|
def test_check_env_accepts_single_string(self) -> None:
|
||||||
"""Test check_env function with a valid single string."""
|
"""Test check_env function with a valid single string."""
|
||||||
self.assertIsNone(check_env(self.set_vars[0]))
|
check_env(self.set_vars[0])
|
||||||
|
|
||||||
def test_check_env_accepts_list_of_strings(self):
|
def test_check_env_accepts_list_of_strings(self) -> None:
|
||||||
"""Test check_env function with a valid list of strings."""
|
"""Test check_env function with a valid list of strings."""
|
||||||
self.assertIsNone(check_env(self.set_vars))
|
check_env(self.set_vars)
|
||||||
|
|
||||||
def test_check_env_accepts_set_of_strings(self):
|
def test_check_env_accepts_set_of_strings(self) -> None:
|
||||||
"""Test check_env function with a valid set of strings."""
|
"""Test check_env function with a valid set of strings."""
|
||||||
self.assertIsNone(check_env(set(self.set_vars)))
|
check_env(set(self.set_vars))
|
||||||
|
|
||||||
def test_check_env_accepts_tuple_of_strings(self):
|
def test_check_env_accepts_tuple_of_strings(self) -> None:
|
||||||
"""Test check_env function with a valid tuple of strings."""
|
"""Test check_env function with a valid tuple of strings."""
|
||||||
self.assertIsNone(check_env(tuple(self.set_vars)))
|
check_env(tuple(self.set_vars))
|
||||||
|
|
||||||
def test_check_env_rejects_empty_list(self):
|
def test_check_env_rejects_empty_list(self) -> None:
|
||||||
"""Test check_env function with an empty list."""
|
"""Test check_env function with an empty list."""
|
||||||
with self.assertRaises(ValueError):
|
with self.assertRaises(ValueError):
|
||||||
check_env([])
|
check_env([])
|
||||||
|
|
||||||
def test_check_env_raises_error_on_missing_vars(self):
|
def test_check_env_raises_error_on_missing_vars(self) -> None:
|
||||||
"""Test check_env function with missing environment variables."""
|
"""Test check_env function with missing environment variables."""
|
||||||
with self.assertRaises(OSError):
|
with self.assertRaises(OSError):
|
||||||
check_env(self.unset_var)
|
check_env(self.unset_var)
|
||||||
|
|
||||||
def test_check_env_does_not_raise_error_when_missing_ok_flag_set(self):
|
def test_check_env_does_not_raise_error_when_missing_ok_flag_set(self) -> None:
|
||||||
"""Test that check_env does not raise an error when the environment variable is missing and missing_ok=True.
|
"""Test that check_env does not raise an error when the environment variable is missing and missing_ok=True.
|
||||||
|
|
||||||
The 'missing_ok' flag allows the function to skip raising an error if the specified environment variable(s) are not set.
|
The 'missing_ok' flag allows the function to skip raising an error if the specified environment variable(s) are not set.
|
||||||
"""
|
"""
|
||||||
self.assertIsNone(check_env(self.unset_var, missing_ok=True))
|
check_env(self.unset_var, missing_ok=True)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""Unittests for the readable function."""
|
"""Unittests for the readable function."""
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from python_utils import readable_unit
|
from python_utils import readable_unit
|
||||||
|
|
||||||
@@ -31,7 +32,11 @@ TEST_CASES = [
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("value, unit, expected", TEST_CASES)
|
@pytest.mark.parametrize("value, unit, expected", TEST_CASES)
|
||||||
def test_readable_unit(value, unit, expected):
|
def test_readable_unit(
|
||||||
|
value: Any, # Allow invalid types for testing
|
||||||
|
unit: Any, # Allow invalid types for testing
|
||||||
|
expected: Any, # Allow invalid types for testing
|
||||||
|
) -> None:
|
||||||
"""Test readable_unit function with valid inputs."""
|
"""Test readable_unit function with valid inputs."""
|
||||||
if isinstance(expected, type) and issubclass(expected, Exception):
|
if isinstance(expected, type) and issubclass(expected, Exception):
|
||||||
with pytest.raises(expected):
|
with pytest.raises(expected):
|
||||||
|
|||||||
Reference in New Issue
Block a user