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
10 changes: 5 additions & 5 deletions common/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bump2version==1.0.1
packaging==22.0
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.2.0
packaging==25.0
pluggy==1.6.0
pyparsing==3.2.4
pytest==8.4.1
six==1.16.0
zipp==3.11.0
zipp==3.23.0
10 changes: 5 additions & 5 deletions dvp/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bump2version==1.0.1
packaging==22.0
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.2.0
packaging==25.0
pluggy==1.6.0
pyparsing==3.2.4
pytest==8.4.1
six==1.16.0
zipp==3.11.0
zipp==3.23.0
12 changes: 6 additions & 6 deletions libs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
./../common
bump2version==1.0.1
mock==4.0.3
packaging==22.0
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.2.0
mock==5.2.0
packaging==25.0
pluggy==1.6.0
pyparsing==3.2.4
pytest==8.4.1
six==1.16.0
zipp==3.11.0
zipp==3.23.0
12 changes: 6 additions & 6 deletions platform/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
./../common
bump2version==1.0.1
mock==4.0.3
packaging==22.0
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.2.0
mock==5.2.0
packaging==25.0
pluggy==1.6.0
pyparsing==3.2.4
pytest==8.4.1
six==1.16.0
zipp==3.11.0
zipp==3.23.0
28 changes: 14 additions & 14 deletions tools/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
./../libs
./../platform
bump2version==1.0.1
coverage==6.5.0
coverage==7.10.6
entrypoints==0.4
flake8==6.0.0
flake8==7.3.0
httpretty==1.0.5
isort==5.11.1
isort==6.0.1
mccabe==0.7.0
mock==4.0.3
more-itertools==9.0.0
packaging==22.0
pluggy==1.0.0
pycodestyle==2.10.0
pyflakes==3.0.1
pyparsing==3.0.9
pytest-cov==4.0.0
pytest==7.2.0
mock==5.2.0
more-itertools==10.7.0
packaging==25.0
pluggy==1.6.0
pycodestyle==2.14.0
pyflakes==3.4.0
pyparsing==3.2.4
pytest-cov==6.2.1
pytest==8.4.1
six==1.16.0
yapf==0.32
zipp==3.11.0
yapf==0.43.0
zipp==3.23.0
18 changes: 9 additions & 9 deletions tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
# - Update the minimum as well as maximum version along with code changes.
#
install_requires = [
"attrs >= 22.2, < 22.3",
"certifi >= 2022, < 2023",
"attrs >= 25.3, < 25.4",
"certifi >= 2024, < 2025",
"click == 7.1.2",
"click-configfile == 0.2.3",
"configparser >= 5.3, < 5.4",
"configparser >= 7.2, < 7.3",
"dvp-libs == {}".format(version),
"dvp-platform == {}".format(version),
"flake8 >= 6.0, < 6.1",
"flake8 >= 7.3, < 7.4",
"httpretty >= 1.0, < 1.1",
"importlib-resources >= 5.10, < 5.11",
"importlib-resources >= 6.5, < 6.6",
"jinja2 >= 3.1, < 3.2",
"jsonschema >= 4.17, < 4.18",
"MarkupSafe >= 2.1, < 2.2",
"jsonschema >= 4.25, < 4.26",
"MarkupSafe >= 3.0, < 3.1",
"pkgutil_resolve_name == 1.3.10",
"pyyaml >= 6, < 7",
"requests >= 2.31, < 2.32",
"requests >= 2.32, < 2.33",
"six >= 1.16, < 1.17",
"zipp >= 3.11, < 3.12",
"zipp >= 3.23, < 3.24",
]

setuptools.setup(name='dvp-tools',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,21 @@ def test_init(tmpdir, ingestion_strategy, host_type, schema_template,

@staticmethod
def test_init_with_relative_path(tmpdir):
os.chdir(tmpdir.strpath)
init.init(".", const.DIRECT_TYPE, "", const.UNIX_HOST_TYPE)
current_dir = os.getcwd()
try:
os.chdir(tmpdir.strpath)
init.init(".", const.DIRECT_TYPE, "", const.UNIX_HOST_TYPE)

result = plugin_util.validate_plugin_config_file(
os.path.join(tmpdir.strpath, init.DEFAULT_PLUGIN_CONFIG_FILE),
True)
result = plugin_util.validate_plugin_config_file(
os.path.join(tmpdir.strpath, init.DEFAULT_PLUGIN_CONFIG_FILE),
True)

config = result.plugin_config_content
config = result.plugin_config_content

# Validate that the plugin name is equal to plugin id
assert config['name'] == config['id']
# Validate that the plugin name is equal to plugin id
assert config['name'] == config['id']
finally:
os.chdir(current_dir)

@staticmethod
def test_init_without_plugin_name(tmpdir):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ def test_object_dict_with_bad_key_type(module):
"\n\tExpected:\t{}(One possible permutation of types)"
"\n\tActual:\t{}")
message = err_info.value.message
assert message in possible_messages,\
assert message in possible_messages, \
assertion_error_message.format(possible_messages[0], message)

@staticmethod
Expand All @@ -826,7 +826,7 @@ def test_object_dict_with_bad_key_type_setter(module):
"\n\tExpected (One possible permutation of types):\t{}"
"\n\tActual:\t{}")
message = err_info.value.message
assert message in possible_messages,\
assert message in possible_messages, \
assertion_error_message.format(possible_messages[0], message)

@staticmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def build_wheel(package, dir):
dist_path = wheel_dir / os.path.basename(package)
dist_path.touch()

global packages
packages.add(str(dist_path))

def clean_up(a, b, c):
Expand Down
Loading