Skip to content

Commit

Permalink
Changed dependency on extended-json-schema-validator, in order to avo…
Browse files Browse the repository at this point in the history
…id issue with jsonschema library on schema validation.
  • Loading branch information
jmfernandez committed Jul 10, 2023
1 parent 9ba5e72 commit fae143e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repos:
# args: [--strict, --show-error-codes, --no-warn-unused-ignores, --python-executable, .pyWEenv/bin/python]
# - repo: meta
- repo: https://github.com/inab/python-extended-json-schema-validator.git
rev: v0.15.0
rev: v0.15.1
hooks:
# - id: identity
- id: jsonschema_dir_validate
Expand Down
20 changes: 0 additions & 20 deletions wfexs_backend/nextflow_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -1210,22 +1210,6 @@ def _get_engine_version_str(
ContConfigPat: "Pattern[str]" = re.compile(
r"process\..*container = '(.+)'$", flags=re.MULTILINE
)
# Pattern for searching for container ['"]([^'"]+)['"] in main workflow
ContScriptPat: "Final[Pattern[str]]" = re.compile(
r"^\s*container\s+(['\"])([^'\"]+)\1"
)

TemplatePat: "Final[Pattern[str]]" = re.compile(r"^\s*template\s+'([^']+)'")
TemplatePatAlt: "Final[Pattern[str]]" = re.compile(r"^\s*template\s+\"([^\"]+)\"")

# Borrowed from https://github.com/nf-core/tools/blob/dec66abe1c36a8975a952e1f80f045cab65bbf72/nf_core/download.py#L462
BlockContainerPat: "Final[Pattern[str]]" = re.compile(
r"container\s*\"([^\"]*)\"", re.S
)

BlockContainerPatAlt: "Final[Pattern[str]]" = re.compile(
r"container\s*'([^']*)'", re.S
)

C_URL_REGEX: "Final[Pattern[str]]" = re.compile(
r"https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)"
Expand All @@ -1239,10 +1223,6 @@ def _get_engine_version_str(
DSLEnablePat: "Final[Pattern[str]]" = re.compile(
r"^\s*nextflow\.enable\.dsl\s*=\s*([1-9])"
)
# Pattern to search includes
IncludeScriptPat: "Final[Pattern[str]]" = re.compile(
r"^\s*include\s+\{[^\}]+\}\s+from\s+(['\"])([^'\"]+)\1"
)

def _genDockSingContainerTaggedName(
self, container_tag: "str"
Expand Down

0 comments on commit fae143e

Please sign in to comment.