Martinvlba/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruff: Enable flake8-comprehensions rule

Browse Source
This commit is contained in:
Jelle van der Waa 2023-11-02 12:42:14 +01:00 committed by Jelle van der Waa
parent 4a80395ee9
commit ffd1ea58be
8 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
feeds.py
View File

@ -66,7 +66,7 @@ def __call__(self, request, *args, **kwargs):
__name__ = 'package_feed'
def get_object(self, request, arch='', repo=''):
obj = dict()
obj = {}
qs = Package.objects.normal().order_by('-last_update')
if arch != '':
@ -99,10 +99,11 @@ def get_object(self, request, arch='', repo=''):
def title(self, obj):
s = 'Arch Linux: Recent package updates'
fields = dict(
arch=obj['arch'].name if 'arch' in obj else None,
repo='[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
repos=obj['repos'].name if 'repos' in obj else None,)
fields = {
'arch': obj['arch'].name if 'arch' in obj else None,
'repo': '[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
'repos': obj['repos'].name if 'repos' in obj else None
}
if fields['arch']:
if fields['repo']:
@ -123,10 +124,11 @@ def title(self, obj):
def description(self, obj):
s = 'Recently updated packages'
fields = dict(
arch=obj['arch'].name if 'arch' in obj else None,
repo='[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
repos=', '.join(['[%s]' % r.name.lower() for r in obj['repos'].all()]) if 'repos' in obj else None,)
fields = {
'arch': obj['arch'].name if 'arch' in obj else None,
'repo': '[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
'repos': ', '.join(['[%s]' % r.name.lower() for r in obj['repos'].all()]) if 'repos' in obj else None
}
if fields['arch']:
s += ' for the \'%(arch)s\' architecture'
@ -186,7 +188,7 @@ def __call__(self, request, *args, **kwargs):
__name__ = 'packages_updates_feed'
def get_object(self, request, operation='', arch='', repo=''):
obj = dict()
obj = {}
if 'added' in request.path:
flag = ADDITION
@ -229,10 +231,11 @@ def get_object(self, request, operation='', arch='', repo=''):
def title(self, obj):
s = 'Arch Linux: Recently %(action)s packages' % obj
fields = dict(
arch=obj['arch'].name if 'arch' in obj else None,
repo='[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
repos=obj['repos'].name if 'repos' in obj else None,)
fields = {
'arch': obj['arch'].name if 'arch' in obj else None,
'repo': '[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
'repos': obj['repos'].name if 'repos' in obj else None
}
if fields['arch']:
if fields['repo']:
@ -253,10 +256,11 @@ def title(self, obj):
def description(self, obj):
s = 'Recently %(action)s packages' % obj
fields = dict(
arch=obj['arch'].name if 'arch' in obj else None,
repo='[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
repos=', '.join(['[%s]' % r.name.lower() for r in obj['repos'].all()]) if 'repos' in obj else None,)
fields = {
'arch': obj['arch'].name if 'arch' in obj else None,
'repo': '[%s]' % obj['repo'].name.lower() if 'repo' in obj else None,
'repos': ', '.join(['[%s]' % r.name.lower() for r in obj['repos'].all()]) if 'repos' in obj else None
}
if fields['arch']:
s += ' for the \'%(arch)s\' architecture'

2
main/migrations/0001_initial.py
View File

@ -113,6 +113,6 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name='package',
unique_together=set([('pkgname', 'repo', 'arch')]),
unique_together={('pkgname', 'repo', 'arch')},
),
]

2
news/views.py
View File

@ -43,7 +43,7 @@ def form_valid(self, form):
ctx = {
'news': newsitem,
}
headers = dict()
headers = {}
if settings.MAILMAN_PASSWORD:
headers['Approved'] = settings.MAILMAN_PASSWORD
template = loader.get_template('news/news_email_notification.txt')

2
packages/migrations/0001_squashed_0003_auto_20170524_0704.py
View File

@ -186,6 +186,6 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name='packagerelation',
unique_together=set([('pkgbase', 'user', 'type')]),
unique_together=[('pkgbase', 'user', 'type')],
),
]

2
packages/tests/test_views.py
View File

@ -24,7 +24,7 @@ def test_reponame(client, package):
data = response.json()
assert len(data['results']) == 5
assert set([r['pkgname'] for r in data['results']]) == {"coreutils", "glibc", "linux", "pacman", "systemd"}
assert {r['pkgname'] for r in data['results']} == {"coreutils", "glibc", "linux", "pacman", "systemd"}
def test_packagename(client, package):

3
packages/views/flag.py
View File

@ -70,8 +70,7 @@ def flag(request, name, repo, arch):
flagged_pkgs = list(pkgs)
# find a common version if there is one available to store
versions = set((pkg.pkgver, pkg.pkgrel, pkg.epoch)
for pkg in flagged_pkgs)
versions = {(pkg.pkgver, pkg.pkgrel, pkg.epoch) for pkg in flagged_pkgs}
if len(versions) == 1:
version = versions.pop()
else:

1
ruff.toml
View File

@ -1,4 +1,5 @@
select = [
"C4", # flake8-comprehensions
"E", # pycodestyle
"F", # pyflakes
]

2
todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py
View File

@ -57,7 +57,7 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name='todolistpackage',
unique_together=set([('todolist', 'pkgname', 'arch')]),
unique_together=[('todolist', 'pkgname', 'arch')],
),
migrations.RemoveField(
model_name='todolist',