Skip to content
Snippets Groups Projects
Commit e3d4e6f5 authored by Jenkins for Software Heritage's avatar Jenkins for Software Heritage
Browse files

Update upstream source from tag 'debian/upstream/1.3.0' 

Update to upstream version '1.3.0'
with Debian dir 0940201a91c39fe99f56ec2ba9d918fd4d6fb635
parents abb1ce96 4accfdce
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 10 deletions
PKG-INFO
+ 43
− 3
View file @ e3d4e6f5
Metadata-Version: 2.1
Name: swh.deposit
Version: 1.2.2
Version: 1.3.0
Summary: Software Heritage Deposit Server
Home-page: https://forge.softwareheritage.org/source/swh-deposit/
Author: Software Heritage developers
......@@ -16,10 +16,50 @@ Classifier: Operating System :: OS Independent
Classifier: Development Status :: 5 - Production/Stable
Requires-Python: >=3.7
Description-Content-Type: text/markdown
Provides-Extra: testing
Provides-Extra: server
License-File: LICENSE
License-File: AUTHORS
Requires-Dist: click
Requires-Dist: iso8601
Requires-Dist: requests
Requires-Dist: sentry-sdk
Requires-Dist: swh.core[http]>=0.4
Requires-Dist: swh.model>=4.4.0
Provides-Extra: testing
Requires-Dist: pytest; extra == "testing"
Requires-Dist: pytest-django; extra == "testing"
Requires-Dist: pytest-mock; extra == "testing"
Requires-Dist: swh.scheduler[testing]; extra == "testing"
Requires-Dist: swh.loader.core[testing]; extra == "testing"
Requires-Dist: pytest-postgresql<4.0.0,>=3; extra == "testing"
Requires-Dist: requests_mock; extra == "testing"
Requires-Dist: django-stubs; extra == "testing"
Requires-Dist: djangorestframework-stubs>=1.4; extra == "testing"
Requires-Dist: django-test-migrations; extra == "testing"
Requires-Dist: types-requests; extra == "testing"
Requires-Dist: types-pyyaml; extra == "testing"
Requires-Dist: django; extra == "testing"
Requires-Dist: djangorestframework; extra == "testing"
Requires-Dist: psycopg2; extra == "testing"
Requires-Dist: setuptools; extra == "testing"
Requires-Dist: xmlschema; extra == "testing"
Requires-Dist: swh.core[http]>=0.4; extra == "testing"
Requires-Dist: swh.loader.core>=0.0.71; extra == "testing"
Requires-Dist: swh.scheduler>=0.7.0; extra == "testing"
Requires-Dist: swh.model>=0.3.8; extra == "testing"
Requires-Dist: swh.auth[django]>=0.5.3; extra == "testing"
Requires-Dist: swh.storage>=0.28.0; extra == "testing"
Provides-Extra: server
Requires-Dist: django; extra == "server"
Requires-Dist: djangorestframework; extra == "server"
Requires-Dist: psycopg2; extra == "server"
Requires-Dist: setuptools; extra == "server"
Requires-Dist: xmlschema; extra == "server"
Requires-Dist: swh.core[http]>=0.4; extra == "server"
Requires-Dist: swh.loader.core>=0.0.71; extra == "server"
Requires-Dist: swh.scheduler>=0.7.0; extra == "server"
Requires-Dist: swh.model>=0.3.8; extra == "server"
Requires-Dist: swh.auth[django]>=0.5.3; extra == "server"
Requires-Dist: swh.storage>=0.28.0; extra == "server"
Software Heritage - Deposit
===========================
......
swh.deposit.egg-info/PKG-INFO
+ 43
− 3
View file @ e3d4e6f5
Metadata-Version: 2.1
Name: swh.deposit
Version: 1.2.2
Version: 1.3.0
Summary: Software Heritage Deposit Server
Home-page: https://forge.softwareheritage.org/source/swh-deposit/
Author: Software Heritage developers
......@@ -16,10 +16,50 @@ Classifier: Operating System :: OS Independent
Classifier: Development Status :: 5 - Production/Stable
Requires-Python: >=3.7
Description-Content-Type: text/markdown
Provides-Extra: testing
Provides-Extra: server
License-File: LICENSE
License-File: AUTHORS
Requires-Dist: click
Requires-Dist: iso8601
Requires-Dist: requests
Requires-Dist: sentry-sdk
Requires-Dist: swh.core[http]>=0.4
Requires-Dist: swh.model>=4.4.0
Provides-Extra: testing
Requires-Dist: pytest; extra == "testing"
Requires-Dist: pytest-django; extra == "testing"
Requires-Dist: pytest-mock; extra == "testing"
Requires-Dist: swh.scheduler[testing]; extra == "testing"
Requires-Dist: swh.loader.core[testing]; extra == "testing"
Requires-Dist: pytest-postgresql<4.0.0,>=3; extra == "testing"
Requires-Dist: requests_mock; extra == "testing"
Requires-Dist: django-stubs; extra == "testing"
Requires-Dist: djangorestframework-stubs>=1.4; extra == "testing"
Requires-Dist: django-test-migrations; extra == "testing"
Requires-Dist: types-requests; extra == "testing"
Requires-Dist: types-pyyaml; extra == "testing"
Requires-Dist: django; extra == "testing"
Requires-Dist: djangorestframework; extra == "testing"
Requires-Dist: psycopg2; extra == "testing"
Requires-Dist: setuptools; extra == "testing"
Requires-Dist: xmlschema; extra == "testing"
Requires-Dist: swh.core[http]>=0.4; extra == "testing"
Requires-Dist: swh.loader.core>=0.0.71; extra == "testing"
Requires-Dist: swh.scheduler>=0.7.0; extra == "testing"
Requires-Dist: swh.model>=0.3.8; extra == "testing"
Requires-Dist: swh.auth[django]>=0.5.3; extra == "testing"
Requires-Dist: swh.storage>=0.28.0; extra == "testing"
Provides-Extra: server
Requires-Dist: django; extra == "server"
Requires-Dist: djangorestframework; extra == "server"
Requires-Dist: psycopg2; extra == "server"
Requires-Dist: setuptools; extra == "server"
Requires-Dist: xmlschema; extra == "server"
Requires-Dist: swh.core[http]>=0.4; extra == "server"
Requires-Dist: swh.loader.core>=0.0.71; extra == "server"
Requires-Dist: swh.scheduler>=0.7.0; extra == "server"
Requires-Dist: swh.model>=0.3.8; extra == "server"
Requires-Dist: swh.auth[django]>=0.5.3; extra == "server"
Requires-Dist: swh.storage>=0.28.0; extra == "server"
Software Heritage - Deposit
===========================
......
swh.deposit.egg-info/SOURCES.txt
+ 1
− 0
View file @ e3d4e6f5
......@@ -150,6 +150,7 @@ swh/deposit/migrations/0019_auto_20200519_1035.py
swh/deposit/migrations/0020_auto_20200929_0855.py
swh/deposit/migrations/0021_deposit_origin_url_20201124_1438.py
swh/deposit/migrations/0022_auto_20220223_1542.py
swh/deposit/migrations/0023_alter_deposit_status_detail_alter_deposit_type_and_more.py
swh/deposit/migrations/__init__.py
swh/deposit/settings/__init__.py
swh/deposit/settings/common.py
......
swh/deposit/migrations/0001_initial.py
+ 3
− 1
View file @ e3d4e6f5
......@@ -10,6 +10,8 @@ from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
from swh.deposit.models import JSONField
class Migration(migrations.Migration):
......@@ -105,7 +107,7 @@ class Migration(migrations.Migration):
fields=[
("id", models.BigAutoField(primary_key=True, serialize=False)),
("date", models.DateTimeField(auto_now_add=True)),
("metadata", django.contrib.postgres.fields.jsonb.JSONField(null=True)),
("metadata", JSONField(null=True)),
(
"deposit",
models.ForeignKey(
......
swh/deposit/migrations/0012_deposit_status_detail.py
+ 3
− 2
View file @ e3d4e6f5
......@@ -2,9 +2,10 @@
# Generated by Django 1.11.14 on 2018-07-09 13:08
from __future__ import unicode_literals
import django.contrib.postgres.fields.jsonb
from django.db import migrations
from swh.deposit.models import JSONField
class Migration(migrations.Migration):
......@@ -16,6 +17,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="deposit",
name="status_detail",
field=django.contrib.postgres.fields.jsonb.JSONField(null=True),
field=JSONField(null=True),
),
]
swh/deposit/migrations/0023_alter_deposit_status_detail_alter_deposit_type_and_more.py 0 → 100644
+ 35
− 0
View file @ e3d4e6f5
# Generated by Django 4.2.4 on 2023-10-02 08:51
# Edited to make it check the Django version
from django.db import migrations, models
from swh.deposit.models import JSONField
class Migration(migrations.Migration):
dependencies = [
("deposit", "0022_auto_20220223_1542"),
]
operations = [
migrations.AlterField(
model_name="deposit",
name="status_detail",
field=JSONField(null=True),
),
migrations.AlterField(
model_name="depositrequest",
name="metadata",
field=JSONField(null=True),
),
migrations.AlterField(
model_name="deposit",
name="type",
field=models.CharField(
choices=[("meta", "meta"), ("code", "code")],
default="code",
max_length=4,
),
),
]
swh/deposit/models.py
+ 16
− 1
View file @ e3d4e6f5
......@@ -11,10 +11,15 @@ import datetime
from typing import Optional
from django.contrib.auth.models import User, UserManager
from django.contrib.postgres.fields import ArrayField, JSONField
from django.contrib.postgres.fields import ArrayField
from django.db import models
from django.utils.timezone import now
try:
from django.db.models import JSONField as OrigJSONField
except ImportError:
from django.contrib.postgres.fields import JSONField as OrigJSONField
from swh.auth.django.models import OIDCUser
from .config import (
......@@ -29,6 +34,16 @@ from .config import (
)
class JSONField(OrigJSONField):
def deconstruct(self):
# the original path was 'django.db.models.JSONField' or
# 'django.contrib.postgres.fields....'
name, path, args, kwargs = super().deconstruct()
# Substitute 'my_app' by your application name everywhere.
path = "swh.deposit.models.JSONField"
return name, path, args, kwargs
class Dbversion(models.Model):
"""Db version"""
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment