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
4 changes: 2 additions & 2 deletions .github/workflows/BuildTest_win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.8", "3.11"]
# python-version: [3.8, 3.9, 3.10, 3.11]
python-version: ["3.9", "3.11"]
# python-version: [3.9, 3.10, 3.11, 3.12]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.11" ]
python-version: [ "3.9", "3.11" ]
name: Setup
steps:
- uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.11" ]
python-version: [ "3.9", "3.11" ]
steps:
- uses: actions/checkout@v3
- name: Restore venv
Expand All @@ -55,7 +55,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.11" ]
python-version: [ "3.9", "3.11" ]
steps:
- uses: actions/checkout@v3
- name: Restore venv
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.11" ]
python-version: [ "3.9", "3.11" ]
steps:
- uses: actions/checkout@v3
- name: Restore venv
Expand All @@ -121,7 +121,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.11" ]
python-version: [ "3.9", "3.11" ]
steps:
- uses: actions/checkout@v3
- name: Restore venv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8" ]
python-version: [ "3.9" ]
# Specifying a GitHub environment is optional, but strongly encouraged
environment: release
permissions:
Expand Down
5 changes: 5 additions & 0 deletions ci/linux/_load_dot_env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

set -a
source $1
set +a
3 changes: 2 additions & 1 deletion ci/linux/build_python_package.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash

if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
echo "Activating .venv first."
. .venv/bin/activate
fi

python -m build
2 changes: 1 addition & 1 deletion ci/linux/create_venv.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

python3 -m venv ./.venv
if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/linux/install_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
echo "Activating .venv first."
Expand Down
3 changes: 2 additions & 1 deletion ci/linux/lint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash

if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
echo "Activating .venv first."
. .venv/bin/activate
fi

flake8 ./src/omotes_sdk ./unit_test/
3 changes: 2 additions & 1 deletion ci/linux/test_unit.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash

if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
echo "Activating .venv first."
. .venv/bin/activate
fi

PYTHONPATH='$PYTHONPATH:src/' pytest --junit-xml=test-results.xml unit_test/
3 changes: 2 additions & 1 deletion ci/linux/typecheck.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash

if [[ "$OSTYPE" != "win32" && "$OSTYPE" != "msys" ]]; then
echo "Activating .venv first."
. .venv/bin/activate
fi

python -m mypy ./src/omotes_sdk ./unit_test/
2 changes: 1 addition & 1 deletion ci/win32/create_venv.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rem @echo off

pushd .
cd /D "%~dp0"
py -3.8 -m venv ..\..\venv
py -3.9 -m venv ..\..\venv
call ..\..\venv\Scripts\activate.bat
python -m pip install pip-tools
popd
36 changes: 20 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "omotes-sdk-python"
requires-python = ">=3.8.1"
requires-python = ">=3.9"
dynamic = ["version"]
authors = [
{ name = "Sebastiaan la Fleur", email = "sebastiaan.lafleur@tno.nl" },
Expand Down Expand Up @@ -35,20 +35,23 @@ dependencies = [

[project.optional-dependencies]
dev = [
"pip-tools~=7.3.0",
"setuptools ~= 69.0.3",
"black ~= 22.1.0",
"flake8 ~= 6.1.0",
"Flake8-pyproject ~= 1.2.3",
"setuptools ~= 75.6.0",
"wheel ~= 0.45.1",
"setuptools-git-versioning >= 2.0, < 3",
"black ~= 24.10.0",
"flake8 == 7.1.1",
"flake8-pyproject ~= 1.2.3",
"flake8-docstrings ~= 1.7.0",
"flake8-quotes ~= 3.3.2",
"pytest ~=7.3.1",
"pytest-cov ~=4.0.0",
"mypy ~= 1.8.0",
"isort ~= 5.13.2",
"build ~= 1.0.3",
"flake8-quotes ~= 3.4.0",
"flake8-bugbear ~= 24.10.31",
"flake8-mock ~= 0.4",
"flake8-tuple ~= 0.4.1",
"pytest ~= 8.3.4",
"pytest-cov ~= 6.0.0",
"mypy ~= 1.13.0",
"isort == 5.13.2",
"build ~= 1.2.2",
"mypy-protobuf ~= 3.5.0",
"setuptools-git-versioning < 2",
]

[project.urls]
Expand All @@ -60,16 +63,17 @@ changelog = "https://github.com/Nieuwe-Warmte-Nu/omotes-sdk-python/blob/main/CHA
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"setuptools ~= 69.0.3",
"wheel ~= 0.40.0",
"setuptools-git-versioning<2",
"setuptools ~= 75.6.0",
"wheel ~= 0.45.1",
"setuptools-git-versioning >= 2.0, < 3",
]

[tool.setuptools.package-data]
"omotes_sdk" = ["py.typed"]

[tool.setuptools-git-versioning]
enabled = true
starting_version = "0.0.1"

[tool.pytest.ini_options]
addopts = "--cov=omotes_sdk --cov-report html --cov-report term-missing --cov-fail-under 62"
Expand Down
2 changes: 1 addition & 1 deletion src/omotes_sdk/omotes_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def __init__(
self,
rabbitmq_config: RabbitMQConfig,
client_id: str,
timeout_on_initial_workflow_definitions: timedelta = timedelta(minutes=1),
timeout_on_initial_workflow_definitions: timedelta = timedelta(minutes=1), # noqa: B008
):
"""Create the OMOTES interface.

Expand Down