From e3997d86d40cc8fcf2eb0563598970fa079854f6 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Fri, 31 Jan 2020 08:29:20 +0100 Subject: [PATCH] django-restframework: fix by splitting variants Split python2 and python3 packages and update to newest versions: * python-django-restframework version 3.9.4 using django1 * python3-django-restframework version 3.11.0 using django3 This fixes the issue that the restframework cannot import name 'python_2_unicode_compatible' from 'django.utils.encoding', when using version 3.9.x together with Django 3.y. Signed-off-by: Peter Stadler --- lang/python/django-restframework/Makefile | 36 ++++--------------- lang/python/django1-restframework/Makefile | 42 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 30 deletions(-) create mode 100644 lang/python/django1-restframework/Makefile diff --git a/lang/python/django-restframework/Makefile b/lang/python/django-restframework/Makefile index 9bff50d15..f9fdbd331 100644 --- a/lang/python/django-restframework/Makefile +++ b/lang/python/django-restframework/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-restframework -PKG_VERSION:=3.9.0 -PKG_RELEASE:=5 +PKG_VERSION:=3.11.0 +PKG_RELEASE:=1 PYPI_NAME:=djangorestframework -PKG_HASH:=607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136 +PKG_HASH:=e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=BSD-3-Clause @@ -20,49 +20,25 @@ PKG_LICENSE_FILES:=LICENSE.md include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -define Package/django-restframework/Default +define Package/python3-django-restframework SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Web APIs for Django, made easy. URL:=https://www.django-rest-framework.org -endef - -define Package/python-django-restframework -$(call Package/django-restframework/Default) - DEPENDS:= \ - +PACKAGE_python-django-restframework:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-restframework/description - Web APIs for Django, made easy. -endef - -define Package/python3-django-restframework -$(call Package/django-restframework/Default) - DEPENDS:= \ - +PACKAGE_python3-django-restframework:python3 \ - python3-django + DEPENDS:=+python3 python3-django VARIANT:=python3 MDEPENDS:=python3-django endef define Package/python3-django-restframework/description -$(call Package/python-django-restframework/description) + Web APIs for Django, made easy. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-restframework)) -$(eval $(call BuildPackage,python-django-restframework)) -$(eval $(call BuildPackage,python-django-restframework-src)) - $(eval $(call Py3Package,python3-django-restframework)) $(eval $(call BuildPackage,python3-django-restframework)) $(eval $(call BuildPackage,python3-django-restframework-src)) diff --git a/lang/python/django1-restframework/Makefile b/lang/python/django1-restframework/Makefile new file mode 100644 index 000000000..040e53144 --- /dev/null +++ b/lang/python/django1-restframework/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007-2017 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=django1-restframework +PKG_VERSION:=3.9.4 +PKG_RELEASE:=1 + +PYPI_NAME:=djangorestframework +PKG_HASH:=c12869cfd83c33d579b17b3cb28a2ae7322a53c3ce85580c2a2ebe4e3f56c4fb + +PKG_MAINTAINER:=Alexandru Ardelean +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE.md + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python-package.mk + +define Package/python-django-restframework + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Web APIs for Django, made easy. + URL:=https://www.django-rest-framework.org + DEPENDS:=+python python-django1 + VARIANT:=python + MDEPENDS:=python-django1 +endef + +define Package/python-django-restframework/description + Web APIs for Django, made easy. +endef + +$(eval $(call PyPackage,python-django-restframework)) +$(eval $(call BuildPackage,python-django-restframework)) +$(eval $(call BuildPackage,python-django-restframework-src))