Skip to content

Migrate Python code style to ruff #67

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

Merged
woswos merged 3 commits into from
Jul 4, 2025
Merged

Migrate Python code style to ruff #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14c3640
Add ruff and typos configurations.
Jul 4, 2025
a350473
Migrate Python code style to ruff.
Jul 4, 2025
6b04574
Add git-blame-ignore-revs.
Jul 4, 2025
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Migrate Python code style to ruff
a350473b6dbadff2eef9fdda9086f2d0724891ca
164 changes: 105 additions & 59 deletions python/mujintestwebstackclient/test_uriutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,118 +5,164 @@
from mujinwebstackclient import uriutils


@pytest.mark.parametrize('uri, expected', [
(u'mujin:/test.mujin.dae', u'mujin'),
(u'file:/test.mujin.dae', u'file'),
])
@pytest.mark.parametrize(
'uri, expected',
[
('mujin:/test.mujin.dae', 'mujin'),
('file:/test.mujin.dae', 'file'),
],
)
def test_GetSchemeFromURI(uri, expected):
assert uriutils.GetSchemeFromURI(uri) == expected


@pytest.mark.parametrize('uri, fragmentSeparator, expected', [
(u'mujin:/测试_test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, u''),
(u'mujin:/测试_test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, u'body0_motion'),
(u'mujin:/测试_test.mujin.dae#body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, u''),
])
@pytest.mark.parametrize(
'uri, fragmentSeparator, expected',
[
('mujin:/测试_test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, ''),
('mujin:/测试_test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, 'body0_motion'),
('mujin:/测试_test.mujin.dae#body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, ''),
],
)
def test_GetFragmentFromURI(uri, fragmentSeparator, expected):
assert uriutils.GetFragmentFromURI(uri, fragmentSeparator=fragmentSeparator) == expected


@pytest.mark.parametrize('uri, fragmentSeparator, expected', [
(u'mujin:/测试_test..mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, '%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion'),
(u'mujin:/测试_test..mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_SHARP, '%E6%B5%8B%E8%AF%95_test..mujin.dae%40body0_motion'),
(u'mujin:/private/s/gittest.mujin.dae', uriutils.FRAGMENT_SEPARATOR_SHARP, 'private%2Fs%2Fgittest.mujin.dae'),
])
@pytest.mark.parametrize(
'uri, fragmentSeparator, expected',
[
('mujin:/测试_test..mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, '%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion'),
('mujin:/测试_test..mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_SHARP, '%E6%B5%8B%E8%AF%95_test..mujin.dae%40body0_motion'),
('mujin:/private/s/gittest.mujin.dae', uriutils.FRAGMENT_SEPARATOR_SHARP, 'private%2Fs%2Fgittest.mujin.dae'),
],
)
def test_GetPrimaryKeyFromURI(uri, fragmentSeparator, expected):
assert uriutils.GetPrimaryKeyFromURI(uri, fragmentSeparator=fragmentSeparator) == expected


@pytest.mark.parametrize('filename, mujinPath, expected', [
(u'/data/detection/测试_test.mujin.dae', u'/data/detection', '%E6%B5%8B%E8%AF%95_test.mujin.dae'),
(u'/data/u/mujin/测试_test.mujin.dae', u'/data/detection', '%2Fdata%2Fu%2Fmujin%2F%E6%B5%8B%E8%AF%95_test.mujin.dae'),
(u'/abcdefg/test.mujin.dae', u'/abc', '%2Fabcdefg%2Ftest.mujin.dae'),
(u'/data/media/mujin/private/s/gittest.mujin.dae', u'/data/media/mujin', 'private%2Fs%2Fgittest.mujin.dae'),
])
@pytest.mark.parametrize(
'filename, mujinPath, expected',
[
('/data/detection/测试_test.mujin.dae', '/data/detection', '%E6%B5%8B%E8%AF%95_test.mujin.dae'),
('/data/u/mujin/测试_test.mujin.dae', '/data/detection', '%2Fdata%2Fu%2Fmujin%2F%E6%B5%8B%E8%AF%95_test.mujin.dae'),
('/abcdefg/test.mujin.dae', '/abc', '%2Fabcdefg%2Ftest.mujin.dae'),
('/data/media/mujin/private/s/gittest.mujin.dae', '/data/media/mujin', 'private%2Fs%2Fgittest.mujin.dae'),
],
)
def test_GetPrimaryKeyFromFilename(filename, mujinPath, expected):
assert uriutils.GetPrimaryKeyFromFilename(filename, mujinPath=mujinPath) == expected


@pytest.mark.parametrize('uri, fragmentSeparator, newFragmentSeparator, expected', [
(u'mujin:/test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_SHARP, u'mujin:/test.mujin.dae#body0_motion'),
(u'mujin:/test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_EMPTY, u'mujin:/test.mujin.dae'),
])
@pytest.mark.parametrize(
'uri, fragmentSeparator, newFragmentSeparator, expected',
[
('mujin:/test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_SHARP, 'mujin:/test.mujin.dae#body0_motion'),
('mujin:/test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_EMPTY, 'mujin:/test.mujin.dae'),
],
)
def test_GetURIFromURI(uri, fragmentSeparator, newFragmentSeparator, expected):
assert uriutils.GetURIFromURI(u'mujin:/test.mujin.dae@body0_motion', fragmentSeparator=fragmentSeparator, newFragmentSeparator=newFragmentSeparator) == expected
assert uriutils.GetURIFromURI('mujin:/test.mujin.dae@body0_motion', fragmentSeparator=fragmentSeparator, newFragmentSeparator=newFragmentSeparator) == expected


@pytest.mark.parametrize('primaryKey, primaryKeySeparator, fragmentSeparator, expected', [
('%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion', uriutils.PRIMARY_KEY_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_SHARP, u'mujin:/测试_test..mujin.dae#body0_motion'),
])
@pytest.mark.parametrize(
'primaryKey, primaryKeySeparator, fragmentSeparator, expected',
[
('%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion', uriutils.PRIMARY_KEY_SEPARATOR_AT, uriutils.FRAGMENT_SEPARATOR_SHARP, 'mujin:/测试_test..mujin.dae#body0_motion'),
],
)
def test_GetURIFromPrimaryKey(primaryKey, primaryKeySeparator, fragmentSeparator, expected):
assert uriutils.GetURIFromPrimaryKey(primaryKey, primaryKeySeparator=primaryKeySeparator, fragmentSeparator=fragmentSeparator) == expected


@pytest.mark.parametrize('filename, mujinPath, expected', [
(u'/data/detection/test.mujin.dae', u'/data/detection', u'mujin:/test.mujin.dae'),
(u'/data/detection/test.mujin.dae', u'/dat', u'mujin:/data/detection/test.mujin.dae'),
])
@pytest.mark.parametrize(
'filename, mujinPath, expected',
[
('/data/detection/test.mujin.dae', '/data/detection', 'mujin:/test.mujin.dae'),
('/data/detection/test.mujin.dae', '/dat', 'mujin:/data/detection/test.mujin.dae'),
],
)
def test_GetURIFromFilename(filename, mujinPath, expected):
assert uriutils.GetURIFromFilename(filename, mujinPath=mujinPath) == expected


@pytest.mark.parametrize('primaryKey, primaryKeySeparator, expected', [
('%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion', uriutils.PRIMARY_KEY_SEPARATOR_AT, u'测试_test..mujin.dae'),
])
@pytest.mark.parametrize(
'primaryKey, primaryKeySeparator, expected',
[
('%E6%B5%8B%E8%AF%95_test..mujin.dae@body0_motion', uriutils.PRIMARY_KEY_SEPARATOR_AT, '测试_test..mujin.dae'),
],
)
def test_GetFilenameFromPrimaryKey(primaryKey, primaryKeySeparator, expected):
assert uriutils.GetFilenameFromPrimaryKey(primaryKey, primaryKeySeparator=primaryKeySeparator) == expected


@pytest.mark.parametrize('uri, mujinPath, fragmentSeparator, expected', [
(u'mujin:/\u691c\u8a3c\u52d5\u4f5c1_121122.mujin.dae', u'/var/www/media/u/testuser', uriutils.FRAGMENT_SEPARATOR_EMPTY, u'/var/www/media/u/testuser/検証動作1_121122.mujin.dae'),
])
@pytest.mark.parametrize(
'uri, mujinPath, fragmentSeparator, expected',
[
('mujin:/\u691c\u8a3c\u52d5\u4f5c1_121122.mujin.dae', '/var/www/media/u/testuser', uriutils.FRAGMENT_SEPARATOR_EMPTY, '/var/www/media/u/testuser/検証動作1_121122.mujin.dae'),
],
)
def test_GetFilenameFromURI(uri, mujinPath, fragmentSeparator, expected):
assert uriutils.GetFilenameFromURI(uri, mujinPath=mujinPath, fragmentSeparator=fragmentSeparator) == expected


@pytest.mark.parametrize('partType, suffix, expected', [
(u'测试_test', u'.tar.gz', u'测试_test.tar.gz'),
])
@pytest.mark.parametrize(
'partType, suffix, expected',
[
('测试_test', '.tar.gz', '测试_test.tar.gz'),
],
)
def test_GetFilenameFromPartType(partType, suffix, expected):
assert uriutils.GetFilenameFromPartType(partType, suffix=suffix) == expected


@pytest.mark.parametrize('primaryKey, expected', [
('%E6%B5%8B%E8%AF%95_test.mujin.dae', u'测试_test'),
])
@pytest.mark.parametrize(
'primaryKey, expected',
[
('%E6%B5%8B%E8%AF%95_test.mujin.dae', '测试_test'),
],
)
def test_GetPartTypeFromPrimaryKey(primaryKey, expected):
assert uriutils.GetPartTypeFromPrimaryKey(primaryKey) == expected


@pytest.mark.parametrize('partType, suffix, expected', [
(u'测试_test', u'.mujin.dae', '%E6%B5%8B%E8%AF%95_test.mujin.dae'),
])
@pytest.mark.parametrize(
'partType, suffix, expected',
[
('测试_test', '.mujin.dae', '%E6%B5%8B%E8%AF%95_test.mujin.dae'),
],
)
def test_GetPrimaryKeyFromPartType(partType, suffix, expected):
assert uriutils.GetPrimaryKeyFromPartType(partType, suffix=suffix) == expected


@pytest.mark.parametrize('partType, suffix, expected', [
(u'测试_test', u'.mujin.dae', u'mujin:/测试_test.mujin.dae'),
])
@pytest.mark.parametrize(
'partType, suffix, expected',
[
('测试_test', '.mujin.dae', 'mujin:/测试_test.mujin.dae'),
],
)
def test_GetURIFromPartType(partType, suffix, expected):
assert uriutils.GetURIFromPartType(partType, suffix=suffix) == expected


@pytest.mark.parametrize('filename, mujinPath, suffix, expected', [
(u'/data/detection/测试_test.mujin.dae', u'/data/detection', u'.mujin.dae', u'测试_test'),
(u'/data/detection/测试_test.mujin.dae', u'/data/dete', u'.mujin.dae', u'/data/detection/测试_test'),
])
@pytest.mark.parametrize(
'filename, mujinPath, suffix, expected',
[
('/data/detection/测试_test.mujin.dae', '/data/detection', '.mujin.dae', '测试_test'),
('/data/detection/测试_test.mujin.dae', '/data/dete', '.mujin.dae', '/data/detection/测试_test'),
],
)
def test_GetPartTypeFromFilename(filename, mujinPath, suffix, expected):
assert uriutils.GetPartTypeFromFilename(filename, mujinPath=mujinPath, suffix=suffix) == expected

@pytest.mark.parametrize('uri, fragmentSeparator, expected', [
(u'mujin:/测试_test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, u'测试_test@body0_motion'),
(u'mujin:/测试_test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, u'测试_test'),
(u'mujin:/test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, u'test'),
])

@pytest.mark.parametrize(
'uri, fragmentSeparator, expected',
[
('mujin:/测试_test.mujin.dae@body0_motion', uriutils.FRAGMENT_SEPARATOR_AT, '测试_test@body0_motion'),
('mujin:/测试_test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, '测试_test'),
('mujin:/test.mujin.dae', uriutils.FRAGMENT_SEPARATOR_AT, 'test'),
],
)
def test_GetPartTypeFromURI(uri, fragmentSeparator, expected):
assert uriutils.GetPartTypeFromURI(uri, fragmentSeparator=fragmentSeparator) == expected
Loading