Update and run pre-commit

This commit is contained in:
Simon Conseil
2022-08-15 17:09:44 +02:00
parent 272f33266d
commit 604b2f9a48
10 changed files with 33 additions and 32 deletions

View File

@@ -11,7 +11,7 @@ links = [
("Another link", "http://example.org"),
]
albums_sort_attr = [ "meta.nokey", "nosuchattribute", "name" ]
albums_sort_attr = ["meta.nokey", "nosuchattribute", "name"]
files_to_copy = (("../watermark.png", "watermark.png"),)
@@ -44,7 +44,12 @@ atom_feed = {"feed_url": "http://127.0.0.1:8000/feed.atom", "nb_items": 10}
titleregexp = {
"regexp": [
{ "search": r"test ?(.*)", "replace": r"titleregexp \1", "substitute": [ [ "2", "02" ] ], "break": 1 }
{
"search": r"test ?(.*)",
"replace": r"titleregexp \1",
"substitute": [["2", "02"]],
"break": 1,
}
]
}

View File

@@ -105,7 +105,6 @@ def test_serve(tmpdir):
def test_set_meta(tmpdir):
testdir = tmpdir.mkdir("test")
testfile = tmpdir.join("test.jpg")

View File

@@ -249,18 +249,18 @@ def test_albums_sort(settings):
settings['albums_sort_reverse'] = False
a = Album('dir1', settings, album['subdirs'], album['medias'], gal)
a.sort_subdirs(['meta.partialorder','meta.order'])
assert [d.name for d in a.albums] == list(['test1','test2','test3'])
a.sort_subdirs(['meta.partialorder', 'meta.order'])
assert [d.name for d in a.albums] == list(['test1', 'test2', 'test3'])
settings['albums_sort_reverse'] = False
a = Album('dir1', settings, album['subdirs'], album['medias'], gal)
a.sort_subdirs(['meta.partialorderb','name'])
assert [d.name for d in a.albums] == list(['test2','test3','test1'])
a.sort_subdirs(['meta.partialorderb', 'name'])
assert [d.name for d in a.albums] == list(['test2', 'test3', 'test1'])
settings['albums_sort_reverse'] = True
a = Album('dir1', settings, album['subdirs'], album['medias'], gal)
a.sort_subdirs(['meta.partialorderb','name'])
assert [d.name for d in a.albums] == list(['test1','test3','test2'])
a.sort_subdirs(['meta.partialorderb', 'name'])
assert [d.name for d in a.albums] == list(['test1', 'test3', 'test2'])
def test_medias_sort(settings):
@@ -329,7 +329,6 @@ def test_gallery(settings, tmp_path, caplog):
def test_custom_theme(settings, tmp_path, caplog):
theme_path = tmp_path / 'mytheme'
tpl_path = theme_path / 'templates'

View File

@@ -7,7 +7,6 @@ CURRENT_DIR = os.path.dirname(__file__)
def test_plugins(settings, tmpdir, disconnect_signals):
settings['destination'] = str(tmpdir)
if "sigal.plugins.nomedia" not in settings["plugins"]:
settings['plugins'] += ["sigal.plugins.nomedia"]
@@ -31,7 +30,6 @@ def test_plugins(settings, tmpdir, disconnect_signals):
def test_nonmedia_files(settings, tmpdir, disconnect_signals):
settings['destination'] = str(tmpdir)
settings['plugins'] += ['sigal.plugins.nonmedia_files']
@@ -48,8 +46,8 @@ def test_nonmedia_files(settings, tmpdir, disconnect_signals):
)
assert os.path.isfile(outthumb)
def test_titleregexp(settings, tmpdir, disconnect_signals):
def test_titleregexp(settings, tmpdir, disconnect_signals):
if "sigal.plugins.titleregexp" not in settings["plugins"]:
settings['plugins'] += ["sigal.plugins.titleregexp"]