Skip to content

Commit

Permalink
Fixed linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mhemesath committed Aug 29, 2023
1 parent 47c2736 commit 3e30278
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
15 changes: 8 additions & 7 deletions omics/rerun/omics-rerun
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,16 @@ Examples:
omics-rerun -d 1234567
"""
import datetime
import dateutil
import botocore
import docopt
import boto3
import time
import json
import sys
import re
import os
import re
import sys
import time

import boto3
import botocore
import dateutil
import docopt

exename = os.path.basename(sys.argv[0])

Expand Down
7 changes: 6 additions & 1 deletion omics/uriparse/uri_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

import re

from omics.common.omics_file_types import OMICS_URI_TYPE_FILENAME_MAP, OMICS_URI_TYPE_DEFAULT_FILENAME_MAP, OmicsFileType
from omics.common.omics_file_types import (
OMICS_URI_TYPE_DEFAULT_FILENAME_MAP,
OMICS_URI_TYPE_FILENAME_MAP,
OmicsFileType,
)


class OmicsUri:
Expand All @@ -14,6 +18,7 @@ class OmicsUri:
ex: omics://429915189008.storage.us-east-1.amazonaws.com/1981413158/readSet/5346184667/source1
ex: omics://429915189008.storage.us-east-1.amazonaws.com/1981413158/reference/5346184667/source
"""

URI_REGEX = r"omics://(\d{10,12})\.storage\.([a-z]{2}-[a-z-]{4,}-\d+)\.amazonaws\.com/(\d{10,36})/(readSet|reference)/(\d{10,36})(/(source[12]?|index))?$"

def __init__(self, omics_uri):
Expand Down
8 changes: 6 additions & 2 deletions tests/uriparse/unit/test_uri_parse.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import unittest

from omics.uriparse.uri_parse import OmicsUri, OmicsUriParser
from tests.uriparse import VALID_READSET_URI, VALID_REFERENCE_URI
from tests.uriparse import VALID_READSET_DEFAULT_FILE_URI, VALID_REFERENCE_DEFAULT_FILE_URI
from tests.uriparse import (
VALID_READSET_DEFAULT_FILE_URI,
VALID_READSET_URI,
VALID_REFERENCE_DEFAULT_FILE_URI,
VALID_REFERENCE_URI,
)


class UriParserTest(unittest.TestCase):
Expand Down

0 comments on commit 3e30278

Please sign in to comment.