Skip to content

Commit 671a3d3

Browse files
jobselkojobselko
authored
Merge pull request #875 from ATIX-AG/upstream/add-black
Add black
2 parents 343d4a7 + 4aeda89 commit 671a3d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+831
-548
lines changed

‎.ci/scripts/schema.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
But some pulp paths start with curly brackets e.g. {artifact_href}
88
This script modifies drf-spectacular schema validation to accept slashes and curly brackets.
99
"""
10+
1011
import json
1112
from drf_spectacular.validation import JSON_SCHEMA_SPEC_PATH
1213

‎.github/workflows/lint.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ jobs:
4343
bump-my-version bump --dry-run release
4444
bump-my-version show-bump
4545
46+
# run black separately from flake8 to get a diff
47+
- name: "Run black"
48+
run: |
49+
black --version
50+
black --check --diff .
51+
4652
# Lint code.
4753
- name: "Run flake8"
4854
run: |

‎lint_requirements.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#
66
# For more info visit https://github.com/pulp/plugin_template
77

8+
black==24.3.0
89
bump-my-version
910
check-manifest
1011
flake8
12+
flake8-black
1113
packaging
1214
yamllint

‎pulp_python/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
default_app_config = 'pulp_python.app.PulpPythonPluginAppConfig'
1+
default_app_config = "pulp_python.app.PulpPythonPluginAppConfig"

‎pulp_python/app/management/commands/repair-python-metadata.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def repair_metadata(content):
2323
batch = []
2424
set_of_update_fields = set()
2525
total_repaired = 0
26-
for package in immediate_content.prefetch_related('_artifacts').iterator(chunk_size=1000):
26+
for package in immediate_content.prefetch_related("_artifacts").iterator(chunk_size=1000):
2727
new_data = artifact_to_python_content_data(
2828
package.filename, package._artifacts.get(), package.pulp_domain
2929
)
@@ -55,7 +55,7 @@ def href_prn_list_handler(value):
5555
(?:{settings.API_ROOT}(?:[-_a-zA-Z0-9]+/)?api/v3/repositories/python/python/[-a-f0-9]+/)
5656
|(?:prn:python\.pythonrepository:[-a-f0-9]+)
5757
""",
58-
re.VERBOSE
58+
re.VERBOSE,
5959
)
6060
values = []
6161
for v in value.split(","):

‎pulp_python/app/migrations/0001_initial.py‎

Lines changed: 127 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,87 +10,164 @@ class Migration(migrations.Migration):
1010
initial = True
1111

1212
dependencies = [
13-
('core', '0091_systemid'),
13+
("core", "0091_systemid"),
1414
]
1515

1616
operations = [
1717
migrations.CreateModel(
18-
name='PythonPublication',
18+
name="PythonPublication",
1919
fields=[
20-
('publication_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpublication', serialize=False, to='core.publication')),
20+
(
21+
"publication_ptr",
22+
models.OneToOneField(
23+
auto_created=True,
24+
on_delete=django.db.models.deletion.CASCADE,
25+
parent_link=True,
26+
primary_key=True,
27+
related_name="python_pythonpublication",
28+
serialize=False,
29+
to="core.publication",
30+
),
31+
),
2132
],
2233
options={
23-
'default_related_name': '%(app_label)s_%(model_name)s',
34+
"default_related_name": "%(app_label)s_%(model_name)s",
2435
},
25-
bases=('core.publication',),
36+
bases=("core.publication",),
2637
),
2738
migrations.CreateModel(
28-
name='PythonRemote',
39+
name="PythonRemote",
2940
fields=[
30-
('remote_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonremote', serialize=False, to='core.remote')),
31-
('prereleases', models.BooleanField(default=False)),
32-
('includes', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
33-
('excludes', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
41+
(
42+
"remote_ptr",
43+
models.OneToOneField(
44+
auto_created=True,
45+
on_delete=django.db.models.deletion.CASCADE,
46+
parent_link=True,
47+
primary_key=True,
48+
related_name="python_pythonremote",
49+
serialize=False,
50+
to="core.remote",
51+
),
52+
),
53+
("prereleases", models.BooleanField(default=False)),
54+
("includes", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
55+
("excludes", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
3456
],
3557
options={
36-
'default_related_name': '%(app_label)s_%(model_name)s',
58+
"default_related_name": "%(app_label)s_%(model_name)s",
3759
},
38-
bases=('core.remote',),
60+
bases=("core.remote",),
3961
),
4062
migrations.CreateModel(
41-
name='PythonRepository',
63+
name="PythonRepository",
4264
fields=[
43-
('repository_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonrepository', serialize=False, to='core.repository')),
65+
(
66+
"repository_ptr",
67+
models.OneToOneField(
68+
auto_created=True,
69+
on_delete=django.db.models.deletion.CASCADE,
70+
parent_link=True,
71+
primary_key=True,
72+
related_name="python_pythonrepository",
73+
serialize=False,
74+
to="core.repository",
75+
),
76+
),
4477
],
4578
options={
46-
'default_related_name': '%(app_label)s_%(model_name)s',
79+
"default_related_name": "%(app_label)s_%(model_name)s",
4780
},
48-
bases=('core.repository',),
81+
bases=("core.repository",),
4982
),
5083
migrations.CreateModel(
51-
name='PythonPackageContent',
84+
name="PythonPackageContent",
5285
fields=[
53-
('content_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythonpackagecontent', serialize=False, to='core.content')),
54-
('filename', models.TextField(db_index=True, unique=True)),
55-
('packagetype', models.TextField(choices=[('bdist_dmg', 'bdist_dmg'), ('bdist_dumb', 'bdist_dumb'), ('bdist_egg', 'bdist_egg'), ('bdist_msi', 'bdist_msi'), ('bdist_rpm', 'bdist_rpm'), ('bdist_wheel', 'bdist_wheel'), ('bdist_wininst', 'bdist_wininst'), ('sdist', 'sdist')])),
56-
('name', models.TextField()),
57-
('version', models.TextField()),
58-
('metadata_version', models.TextField()),
59-
('summary', models.TextField()),
60-
('description', models.TextField()),
61-
('keywords', models.TextField()),
62-
('home_page', models.TextField()),
63-
('download_url', models.TextField()),
64-
('author', models.TextField()),
65-
('author_email', models.TextField()),
66-
('maintainer', models.TextField()),
67-
('maintainer_email', models.TextField()),
68-
('license', models.TextField()),
69-
('requires_python', models.TextField()),
70-
('project_url', models.TextField()),
71-
('platform', models.TextField()),
72-
('supported_platform', models.TextField()),
73-
('requires_dist', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
74-
('provides_dist', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
75-
('obsoletes_dist', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
76-
('requires_external', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
77-
('classifiers', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
86+
(
87+
"content_ptr",
88+
models.OneToOneField(
89+
auto_created=True,
90+
on_delete=django.db.models.deletion.CASCADE,
91+
parent_link=True,
92+
primary_key=True,
93+
related_name="python_pythonpackagecontent",
94+
serialize=False,
95+
to="core.content",
96+
),
97+
),
98+
("filename", models.TextField(db_index=True, unique=True)),
99+
(
100+
"packagetype",
101+
models.TextField(
102+
choices=[
103+
("bdist_dmg", "bdist_dmg"),
104+
("bdist_dumb", "bdist_dumb"),
105+
("bdist_egg", "bdist_egg"),
106+
("bdist_msi", "bdist_msi"),
107+
("bdist_rpm", "bdist_rpm"),
108+
("bdist_wheel", "bdist_wheel"),
109+
("bdist_wininst", "bdist_wininst"),
110+
("sdist", "sdist"),
111+
]
112+
),
113+
),
114+
("name", models.TextField()),
115+
("version", models.TextField()),
116+
("metadata_version", models.TextField()),
117+
("summary", models.TextField()),
118+
("description", models.TextField()),
119+
("keywords", models.TextField()),
120+
("home_page", models.TextField()),
121+
("download_url", models.TextField()),
122+
("author", models.TextField()),
123+
("author_email", models.TextField()),
124+
("maintainer", models.TextField()),
125+
("maintainer_email", models.TextField()),
126+
("license", models.TextField()),
127+
("requires_python", models.TextField()),
128+
("project_url", models.TextField()),
129+
("platform", models.TextField()),
130+
("supported_platform", models.TextField()),
131+
("requires_dist", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
132+
("provides_dist", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
133+
("obsoletes_dist", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
134+
("requires_external", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
135+
("classifiers", django.contrib.postgres.fields.jsonb.JSONField(default=list)),
78136
],
79137
options={
80-
'default_related_name': '%(app_label)s_%(model_name)s',
81-
'unique_together': {('filename',)},
138+
"default_related_name": "%(app_label)s_%(model_name)s",
139+
"unique_together": {("filename",)},
82140
},
83-
bases=('core.content',),
141+
bases=("core.content",),
84142
),
85143
migrations.CreateModel(
86-
name='PythonDistribution',
144+
name="PythonDistribution",
87145
fields=[
88-
('basedistribution_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='python_pythondistribution', serialize=False, to='core.basedistribution')),
89-
('publication', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='python_pythondistribution', to='core.publication')),
146+
(
147+
"basedistribution_ptr",
148+
models.OneToOneField(
149+
auto_created=True,
150+
on_delete=django.db.models.deletion.CASCADE,
151+
parent_link=True,
152+
primary_key=True,
153+
related_name="python_pythondistribution",
154+
serialize=False,
155+
to="core.basedistribution",
156+
),
157+
),
158+
(
159+
"publication",
160+
models.ForeignKey(
161+
null=True,
162+
on_delete=django.db.models.deletion.SET_NULL,
163+
related_name="python_pythondistribution",
164+
to="core.publication",
165+
),
166+
),
90167
],
91168
options={
92-
'default_related_name': '%(app_label)s_%(model_name)s',
169+
"default_related_name": "%(app_label)s_%(model_name)s",
93170
},
94-
bases=('core.basedistribution',),
171+
bases=("core.basedistribution",),
95172
),
96173
]

‎pulp_python/app/migrations/0002_pythonpackagecontent_python_version.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('python', '0001_initial'),
9+
("python", "0001_initial"),
1010
]
1111

1212
operations = [
1313
migrations.AddField(
14-
model_name='pythonpackagecontent',
15-
name='python_version',
16-
field=models.TextField(default=''),
14+
model_name="pythonpackagecontent",
15+
name="python_version",
16+
field=models.TextField(default=""),
1717
preserve_default=False,
1818
),
1919
]

‎pulp_python/app/migrations/0003_new_sync_filters.py‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,47 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('python', '0002_pythonpackagecontent_python_version'),
10+
("python", "0002_pythonpackagecontent_python_version"),
1111
]
1212

1313
operations = [
1414
migrations.AddField(
15-
model_name='pythonremote',
16-
name='exclude_platforms',
17-
field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=10), choices=[('windows', 'windows'), ('macos', 'macos'), ('freebsd', 'freebsd'), ('linux', 'linux')], default=list, size=None),
15+
model_name="pythonremote",
16+
name="exclude_platforms",
17+
field=django.contrib.postgres.fields.ArrayField(
18+
base_field=models.CharField(blank=True, max_length=10),
19+
choices=[
20+
("windows", "windows"),
21+
("macos", "macos"),
22+
("freebsd", "freebsd"),
23+
("linux", "linux"),
24+
],
25+
default=list,
26+
size=None,
27+
),
1828
),
1929
migrations.AddField(
20-
model_name='pythonremote',
21-
name='keep_latest_packages',
30+
model_name="pythonremote",
31+
name="keep_latest_packages",
2232
field=models.IntegerField(default=0),
2333
),
2434
migrations.AddField(
25-
model_name='pythonremote',
26-
name='package_types',
27-
field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=15), choices=[('bdist_dmg', 'bdist_dmg'), ('bdist_dumb', 'bdist_dumb'), ('bdist_egg', 'bdist_egg'), ('bdist_msi', 'bdist_msi'), ('bdist_rpm', 'bdist_rpm'), ('bdist_wheel', 'bdist_wheel'), ('bdist_wininst', 'bdist_wininst'), ('sdist', 'sdist')], default=list, size=None),
35+
model_name="pythonremote",
36+
name="package_types",
37+
field=django.contrib.postgres.fields.ArrayField(
38+
base_field=models.CharField(blank=True, max_length=15),
39+
choices=[
40+
("bdist_dmg", "bdist_dmg"),
41+
("bdist_dumb", "bdist_dumb"),
42+
("bdist_egg", "bdist_egg"),
43+
("bdist_msi", "bdist_msi"),
44+
("bdist_rpm", "bdist_rpm"),
45+
("bdist_wheel", "bdist_wheel"),
46+
("bdist_wininst", "bdist_wininst"),
47+
("sdist", "sdist"),
48+
],
49+
default=list,
50+
size=None,
51+
),
2852
),
2953
]

0 commit comments

Comments
 (0)