From ec97bdee355752a92d4b9f3a5d566ee0e424a700 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 4 Feb 2020 04:55:04 +0800 Subject: [PATCH] django1-restframework: Rename to django-restframework39, add Py3 package Signed-off-by: Jeffery To --- lang/python/django-restframework39/Makefile | 69 +++++++++++++++++++++ lang/python/django1-restframework/Makefile | 42 ------------- net/seafile-seahub/Makefile | 4 +- 3 files changed, 71 insertions(+), 44 deletions(-) create mode 100644 lang/python/django-restframework39/Makefile delete mode 100644 lang/python/django1-restframework/Makefile diff --git a/lang/python/django-restframework39/Makefile b/lang/python/django-restframework39/Makefile new file mode 100644 index 000000000..079c42e19 --- /dev/null +++ b/lang/python/django-restframework39/Makefile @@ -0,0 +1,69 @@ +# +# 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:=django-restframework39 +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 +include ../python3-package.mk + +define Package/django-restframework39/Default + 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-restframework39 +$(call Package/django-restframework39/Default) + DEPENDS:= \ + +PACKAGE_python-django-restframework39:python \ + python-django1 + VARIANT:=python + MDEPENDS:=python-django1 +endef + +define Package/python-django-restframework39/description + Web APIs for Django, made easy. (3.9 series) +endef + +define Package/python3-django-restframework39 +$(call Package/django-restframework39/Default) + DEPENDS:= \ + +PACKAGE_python3-django-restframework39:python3 \ + python3-django + CONFLICTS:=python3-django-restframework + VARIANT:=python3 + MDEPENDS:=python3-django +endef + +define Package/python3-django-restframework39/description +$(call Package/python-django-restframework39/description) +. +(Variant for Python3) +endef + +$(eval $(call PyPackage,python-django-restframework39)) +$(eval $(call BuildPackage,python-django-restframework39)) +$(eval $(call BuildPackage,python-django-restframework39-src)) + +$(eval $(call Py3Package,python3-django-restframework39)) +$(eval $(call BuildPackage,python3-django-restframework39)) +$(eval $(call BuildPackage,python3-django-restframework39-src)) diff --git a/lang/python/django1-restframework/Makefile b/lang/python/django1-restframework/Makefile deleted file mode 100644 index 040e53144..000000000 --- a/lang/python/django1-restframework/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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)) diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index bfae7f432..a479c7d4e 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-seahub PKG_VERSION:=6.3.4 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server? @@ -29,7 +29,7 @@ include ../../lang/python/python-package.mk SEAFILE_PYTHON_DEPENDS:= \ simplejson chardet dateutil mysqlclient pytz qrcode requests requests-oauthlib \ django1 django-constance django-appconf django-compressor django-formtools \ - django-jsonfield django-picklefield django-postoffice django-restframework \ + django-jsonfield django-picklefield django-postoffice django-restframework39 \ pillow django-simple-captcha django-statici18n django-webpack-loader define Package/seafile-seahub