Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: wms monitor arg ints #1181

Merged
merged 5 commits into from Oct 21, 2021
Merged

fix: wms monitor arg ints #1181

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a36dd8
Fixes #1180. No longer casting WMS args as integers.
Tobias-Ternent Sep 17, 2021
bbd5b0b
Fixes #1180. Removing unused parse_resources() import.
Tobias-Ternent Sep 17, 2021
443eb52
Fixing WMS args parsing.
Tobias-Ternent Sep 17, 2021
daa0c87
Removed unused imports.
Tobias-Ternent Sep 17, 2021
13b1d1a
Merge branch 'main' into bugfix/wms-monitor-arg-ints
johanneskoester Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions snakemake/logging.py
View file
Open in desktop
Expand Up @@ -11,10 +11,8 @@
import os
import json
import threading
import tempfile
from functools import partial
import inspect
import traceback
import textwrap

from snakemake.common import DYNAMIC_FILL
Expand Down Expand Up @@ -128,10 +126,10 @@ def __init__(self, address=None, args=None, metadata=None):
workflow will already be running and it would not be worth stopping it.
"""

from snakemake.resources import parse_resources
from snakemake.resources import DefaultResources

self.address = address or "http:127.0.0.1:5000"
self.args = parse_resources(args) or []
self.args = map(DefaultResources.decode_arg, args) if args else []
self.metadata = metadata or {}

# A token is suggested but not required, depends on server
Expand Down