Merge pull request #11565 from jefferyto/seafile-7.1.2

seafile-server: Update to 7.1.2, update dependencies
This commit is contained in:
Hannu Nyman
2020-03-16 20:22:49 +02:00
committed by GitHub
63 changed files with 2252 additions and 1059 deletions

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-appconf
PKG_VERSION:=1.0.2
PKG_RELEASE:=6
PKG_VERSION:=1.0.3
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=6a4d9aea683b4c224d97ab8ee11ad2d29a37072c0c6c509896dd9857466fb261
PKG_HASH:=35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=BSD-3-Clause
@@ -35,7 +35,8 @@ define Package/python-django-appconf
$(call Package/django-appconf/Default)
DEPENDS:= \
+PACKAGE_python-django-appconf:python \
python-django1
python-django1 \
+PACKAGE_python-django-appconf:python-six
VARIANT:=python
MDEPENDS:=python-django1
endef
@@ -48,7 +49,8 @@ define Package/python3-django-appconf
$(call Package/django-appconf/Default)
DEPENDS:= \
+PACKAGE_python3-django-appconf:python3 \
+PACKAGE_python3-django-appconf:python3-django1
+PACKAGE_python3-django-appconf:python3-django1 \
+PACKAGE_python3-django-appconf:python3-six
VARIANT:=python3
endef

View File

@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-jsonfield
PKG_VERSION:=1.0.1
PKG_RELEASE:=6
PKG_VERSION:=2.1.1
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=6c0afd5554739365b55d86e285cf966cc3a45682fff963463364ea1f6511ca3e
PYPI_NAME:=jsonfield
PKG_HASH:=ed7c5e1829e9453e24a8bebef1e702ffe402e6def6b326f0e0b88764c59a6dc7
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
include ../pypi.mk
@@ -27,28 +27,31 @@ define Package/django-jsonfield/Default
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
TITLE:=JSONField for django models
URL:=https://github.com/adamchainz/django-jsonfield
TITLE:=A reusable Django field to store validated JSON in models
URL:=https://github.com/rpkilby/jsonfield
endef
define Package/python-django-jsonfield
$(call Package/django-jsonfield/Default)
DEPENDS:= \
+PACKAGE_python-django-jsonfield:python \
python-django1
python-django1 \
+PACKAGE_python-django-jsonfield:python-six
VARIANT:=python
MDEPENDS:=python-django1
endef
define Package/python-django-jsonfield/description
JSONField for django models
jsonfield is a reusable model field that allows you to store validated
JSON, automatically handling serialization to and from the database.
endef
define Package/python3-django-jsonfield
$(call Package/django-jsonfield/Default)
DEPENDS:= \
+PACKAGE_python3-django-jsonfield:python3 \
+PACKAGE_python3-django-jsonfield:python3-django1
+PACKAGE_python3-django-jsonfield:python3-django1 \
+PACKAGE_python3-django-jsonfield:python3-six
VARIANT:=python3
endef

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-picklefield
PKG_VERSION:=1.1.0
PKG_RELEASE:=5
PKG_VERSION:=2.1.1
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=ce7fee5c6558fe5dc8924993d994ccde75bb75b91cd82787cbd4c92b95a69f9c
PKG_HASH:=67a5e156343e3b032cac2f65565f0faa81635a99c7da74b0f07a0f5db467b646
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=MIT
@@ -23,6 +23,11 @@ include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
include ../python3-package.mk
PYTHON_PKG_SETUP_VARS:= \
PKG_VERSION="$(PKG_VERSION)"
PYTHON3_PKG_SETUP_VARS:= \
PKG_VERSION="$(PKG_VERSION)"
define Package/django-picklefield/Default
SUBMENU:=Python
SECTION:=lang

View File

@@ -0,0 +1,19 @@
--- a/setup.py
+++ b/setup.py
@@ -2,14 +2,14 @@ from __future__ import unicode_literals
from setuptools import find_packages, setup
-import picklefield
+import os
with open('README.rst') as file_:
long_description = file_.read()
setup(
name='django-picklefield',
- version=picklefield.__version__,
+ version=os.getenv('PKG_VERSION'),
description='Pickled object field for Django',
long_description=long_description,
author='Simon Charette',

View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-postoffice
PKG_VERSION:=3.1.0
PKG_RELEASE:=6
PKG_VERSION:=3.2.1
PKG_RELEASE:=1
PYPI_NAME:=django-post-office
PYPI_SOURCE_NAME:=django-post_office
PKG_HASH:=827937a944fe47cea393853069cd9315d080298c8ddb0faf787955d6aa51a030
PKG_HASH:=e32427822f647719575094f790ca949ef9f9827ec0e8378cb021f01f3834b2a4
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=MIT

View File

@@ -26,7 +26,7 @@ define Package/django-ranged-response/Default
SECTION:=lang
CATEGORY:=Languages
TITLE:=Add Content-Range: to FileResponse
URL:=https://github.com/wearespindle/django-ranged-fileresponse
URL:=https://github.com/i3thuan5/django-ranged-response
endef
define Package/python-django-ranged-response

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-statici18n
PKG_VERSION:=1.8.2
PKG_RELEASE:=6
PKG_VERSION:=1.9.0
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=ba9eeb3c4517027922645999359f8335fbb9fea04c457123cfbd6b4a36cbeda4
PKG_HASH:=913dd056c1abcbe129b1db806cb4cfb821c4077d7e857d6eb29043ea64f4d1d0
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=BSD-3-Clause
@@ -35,7 +35,9 @@ define Package/python-django-statici18n
$(call Package/django-statici18n/Default)
DEPENDS:= \
+PACKAGE_python-django-statici18n:python \
python-django1
python-django1 \
+PACKAGE_python-django-statici18n:python-django-appconf \
+PACKAGE_python-django-statici18n:python-six
VARIANT:=python
MDEPENDS:=python-django1
endef
@@ -48,7 +50,9 @@ define Package/python3-django-statici18n
$(call Package/django-statici18n/Default)
DEPENDS:= \
+PACKAGE_python3-django-statici18n:python3 \
+PACKAGE_python3-django-statici18n:python3-django1
+PACKAGE_python3-django-statici18n:python3-django1 \
+PACKAGE_python3-django-statici18n:python3-django-appconf \
+PACKAGE_python3-django-statici18n:python3-six
VARIANT:=python3
endef

View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django1
PKG_VERSION:=1.11.29
PKG_RELEASE:=1
PKG_RELEASE:=2
PYPI_NAME:=Django
PKG_HASH:=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c

View File

@@ -0,0 +1,11 @@
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -106,7 +106,7 @@ class MigrationLoader(object):
# Scan for .py files
migration_names = set()
for name in os.listdir(directory):
- if name.endswith(".py"):
+ if name.endswith(".py") or name.endswith(".pyc"):
import_name = name.rsplit(".", 1)[0]
if import_name[0] not in "_.~":
migration_names.add(import_name)