Skip to content

Commit

Permalink
Merge pull request #86 from Integration-Automation/dev
Browse files Browse the repository at this point in the history
Update stable and dev version
  • Loading branch information
JE-Chen authored Jul 22, 2024
2 parents 44ee178 + 43f7f4b commit 75b70b0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions stable.toml → dev.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# Rename to stable version
# This is stable version
# Rename to dev version
# This is dev version
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "je_load_density"
version = "0.0.55"
name = "je_load_density_dev"
version = "0.0.66"
authors = [
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
]
description = "Load & Stress Automation Freamework"
requires-python = ">=3.9"
license = { text = "MIT" }
dependencies = [
"locust",
"APScheduler",
"locust", "APScheduler",
]
classifiers = [
"Programming Language :: Python :: 3.9",
Expand Down
4 changes: 1 addition & 3 deletions je_load_density/utils/executor/action_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ def execute_action(self, action_list: [list, dict]) -> dict:
raise LoadDensityTestExecuteException(executor_list_error)
execute_record_dict = dict()
try:
if len(action_list) > 0 or isinstance(action_list, list):
pass
else:
if len(action_list) == 0 or isinstance(action_list, list) is False:
raise LoadDensityTestExecuteException(executor_list_error)
except Exception as error:
print(repr(error), file=sys.stderr)
Expand Down
4 changes: 2 additions & 2 deletions je_load_density/utils/scheduler/extend_apscheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def add_blocking_job(
"""
params = locals()
params.pop("self")
trigger_args = params.pop("trigger_args")
params.pop("trigger_args")
return self._blocking_schedulers.add_job(**params, **trigger_args)

def add_nonblocking_job(
Expand Down Expand Up @@ -92,7 +92,7 @@ def add_nonblocking_job(
"""
params = locals()
params.pop("self")
trigger_args = params.pop("trigger_args")
params.pop("trigger_args")
return self._background_schedulers.add_job(**params, **trigger_args)

def get_blocking_scheduler(self) -> BlockingScheduler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ def dict_to_elements_tree(json_dict: dict):
"""

def _to_elements_tree(json_dict: dict, root):
if not json_dict:
pass
elif isinstance(json_dict, str):
if isinstance(json_dict, str):
root.text = json_dict
elif isinstance(json_dict, dict):
for key, value in json_dict.items():
Expand Down
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# Rename to dev version
# This is dev version
# Rename to stable version
# This is stable version
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "je_load_density_dev"
version = "0.0.65"
name = "je_load_density"
version = "0.0.56"
authors = [
{ name = "JE-Chen", email = "jechenmailman@gmail.com" },
]
description = "Load & Stress Automation Freamework"
requires-python = ">=3.9"
license = { text = "MIT" }
dependencies = [
"locust", "APScheduler",
"locust",
"APScheduler",
]
classifiers = [
"Programming Language :: Python :: 3.9",
Expand Down

0 comments on commit 75b70b0

Please sign in to comment.