Skip to content

Commit

Permalink
Merge pull request #48 from craig8/feature/v11-test-updates
Browse files Browse the repository at this point in the history
Feature/v11 test updates
  • Loading branch information
schandrika authored Oct 25, 2024
2 parents 4ad5b4b + bbd81be commit c43555b
Show file tree
Hide file tree
Showing 16 changed files with 1,887 additions and 1,870 deletions.
38 changes: 20 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "volttron-testing"
version = "0.4.1rc"
version = "0.4.1rc1"
description = "The volttron-testing library contains classes and utilities for interacting with a VOLTTRON instance."
authors = ["VOLTTRON Team <[email protected]>"]
license = "Apache License 2.0"
Expand All @@ -20,27 +20,29 @@ classifiers = [

[tool.poetry.dependencies]
python = ">=3.10,<4.0"
pytest = "^6.2.5"
mock = "^4.0.3"
pytest = "^8.3.3"
anypubsub = "^0.6"
grequests = "^0.6.0"
#volttron = ">=10.0.3a9,<11.0"

# This will bring in volttron-core, lib-zmq and lib-auth by default
#volttron = "^11.0.0rc0"

volttron-core = { path="../volttron-core", develop = true}

docker = "^6.0.1"
pytest-timeout = "^2.1.0"
docker = "^7.1.0"
pytest-timeout = "^2.3.1"
tomli-w = "^1.1.0"
gitpython = "^3.1.43"
tomli = "^2.0.2"
pytest-virtualenv = "^1.8.0"

[tool.poetry.group.dev.dependencies]
# formatting, quality, tests
pre-commit = "^2.17.0"
yapf = "^0.32.0"
toml = "^0.10.2"
isort = "^5.10.1"
safety = "^1.10.3"
mypy = "^0.942"
coverage = "^6.3.2"
Sphinx = "^4.5.0"
sphinx-rtd-theme = "^1.0.0"
# These can be commented out if using volttron or volttron-zmq because they
# are bringing those libraries in as dependencies.
#
# If local use these libraries or use lib-auth and lib-zmq
volttron-lib-auth = {path="../volttron-lib-auth", develop=true}
volttron-lib-zmq = {path="../volttron-lib-zmq", develop=true}


[tool.yapfignore]
ignore_patterns = [
Expand All @@ -53,7 +55,7 @@ ignore_patterns = [
[tool.yapf]
based_on_style = "pep8"
spaces_before_comment = 4
column_limit = 99
column_limit = 120
split_before_logical_operator = true

[tool.mypy]
Expand Down
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[pytest]
markers =
control: Test for volttron-ctl or vctl commands
config_store: Test for config store subsystem.
17 changes: 17 additions & 0 deletions src/volttrontesting/fixtures/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import os
from pathlib import Path

import pytest


@pytest.fixture(scope="session")
def get_pyproject_toml() -> Path:
for parent in Path(os.getcwd()).parents:
if (parent / "pyproject.toml").exists():
return parent / "pyproject.toml"

for parent in Path(__file__).parents:
if (parent / "pyproject.toml").exists():
return parent / "pyproject.toml"

raise ValueError("Could not find pyproject.toml file tree.")
Loading

0 comments on commit c43555b

Please sign in to comment.