Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

django: convert to python pkg format + add python3 variant

Browse source 
This also updates all dependencies to use the new `python-django` package.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry-picked from commit f026dba26e)
This commit is contained in:
Alexandru Ardelean 2019-06-03 15:25:39 +03:00 committed by Josef Schlehofer
parent 88c3765a69
commit f8ff5017d2
No known key found for this signature in database
GPG key ID: B950216FE4329F4C
14 changed files with 61 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/python/django-appconf/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-appconf PKG_NAME:=django-appconf
PKG_VERSION:=1.0.2 PKG_VERSION:=1.0.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -26,7 +26,7 @@ define Package/django-appconf
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=A helper class for handling configuration defaults of packaged apps gracefully. TITLE:=A helper class for handling configuration defaults of packaged apps gracefully.
URL:=http://django-appconf.readthedocs.org/ URL:=http://django-appconf.readthedocs.org/
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-appconf/description define Package/django-appconf/description

4
lang/python/django-compressor/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-compressor PKG_NAME:=django-compressor
PKG_VERSION:=2.2 PKG_VERSION:=2.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@ -30,7 +30,7 @@ define Package/django-compressor
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Compress CSS/JS into single cached files TITLE:=Compress CSS/JS into single cached files
URL:=http://django-compressor.readthedocs.org/ URL:=http://django-compressor.readthedocs.org/
DEPENDS:=+python +django +django-appconf +python-rcssmin DEPENDS:=+python +python-django +django-appconf +python-rcssmin
VARIANT:=python VARIANT:=python
endef endef

4
lang/python/django-constance/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-constance PKG_NAME:=django-constance
PKG_VERSION:=2.3.1 PKG_VERSION:=2.3.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -26,7 +26,7 @@ define Package/django-constance
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Django live settings with pluggable backends, including Redis. TITLE:=Django live settings with pluggable backends, including Redis.
URL:=https://github.com/jazzband/django-constance URL:=https://github.com/jazzband/django-constance
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-constance/description define Package/django-constance/description

4
lang/python/django-formtools/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-formtools PKG_NAME:=django-formtools
PKG_VERSION:=2.1 PKG_VERSION:=2.1
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com> PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
@ -26,7 +26,7 @@ define Package/django-formtools
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=High-level abstractions for Django forms TITLE:=High-level abstractions for Django forms
URL:=https://django-formtools.readthedocs.io/en/latest/ URL:=https://django-formtools.readthedocs.io/en/latest/
DEPENDS:=+python +django DEPENDS:=+python +python-django
VARIANT:=python VARIANT:=python
endef endef

4
lang/python/django-jsonfield/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-jsonfield PKG_NAME:=django-jsonfield
PKG_VERSION:=1.0.1 PKG_VERSION:=1.0.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -26,7 +26,7 @@ define Package/django-jsonfield
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=JSONField for django models TITLE:=JSONField for django models
URL:=https://github.com/bradjasper/django-jsonfield URL:=https://github.com/bradjasper/django-jsonfield
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-jsonfield/description define Package/django-jsonfield/description

4
lang/python/django-picklefield/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-picklefield PKG_NAME:=django-picklefield
PKG_VERSION:=1.1.0 PKG_VERSION:=1.1.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -26,7 +26,7 @@ define Package/django-picklefield
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Pickled object field for Django TITLE:=Pickled object field for Django
URL:=https://github.com/gintas/django-picklefield URL:=https://github.com/gintas/django-picklefield
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-picklefield/description define Package/django-picklefield/description

4
lang/python/django-postoffice/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-postoffice PKG_NAME:=django-postoffice
PKG_VERSION:=3.1.0 PKG_VERSION:=3.1.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_SOURCE:=django-post_office-$(PKG_VERSION).tar.gz PKG_SOURCE:=django-post_office-$(PKG_VERSION).tar.gz
@ -27,7 +27,7 @@ define Package/django-postoffice
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=A Django app to monitor and send mail asynchronously, complete with template support. TITLE:=A Django app to monitor and send mail asynchronously, complete with template support.
URL:=https://github.com/ui/django-postoffice URL:=https://github.com/ui/django-postoffice
DEPENDS:=+python +django +django-jsonfield DEPENDS:=+python +python-django +django-jsonfield
endef endef
define Package/django-postoffice/description define Package/django-postoffice/description

4
lang/python/django-ranged-response/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-ranged-response PKG_NAME:=django-ranged-response
PKG_VERSION:=0.2.0 PKG_VERSION:=0.2.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com> PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@ -25,7 +25,7 @@ define Package/django-ranged-response
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Add Content-Range: to FileResponse TITLE:=Add Content-Range: to FileResponse
URL:=https://github.com/wearespindle/django-ranged-fileresponse URL:=https://github.com/wearespindle/django-ranged-fileresponse
DEPENDS:=+python +django DEPENDS:=+python +python-django
VARIANT:=python VARIANT:=python
endef endef

4
lang/python/django-restframework/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-restframework PKG_NAME:=django-restframework
PKG_VERSION:=3.9.0 PKG_VERSION:=3.9.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=djangorestframework-$(PKG_VERSION).tar.gz PKG_SOURCE:=djangorestframework-$(PKG_VERSION).tar.gz
@ -27,7 +27,7 @@ define Package/django-restframework
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Web APIs for Django, made easy. TITLE:=Web APIs for Django, made easy.
URL:=https://www.django-rest-framework.org URL:=https://www.django-rest-framework.org
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-restframework/description define Package/django-restframework/description

4
lang/python/django-simple-captcha/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-simple-captcha PKG_NAME:=django-simple-captcha
PKG_VERSION:=0.5.11 PKG_VERSION:=0.5.11
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com> PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@ -28,7 +28,7 @@ define Package/django-simple-captcha
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Simple Django captcha application TITLE:=Simple Django captcha application
URL:=https://github.com/mbi/django-simple-captcha URL:=https://github.com/mbi/django-simple-captcha
DEPENDS:=+python +python-six +django +pillow +django-ranged-response DEPENDS:=+python +python-six +python-django +pillow +django-ranged-response
VARIANT:=python VARIANT:=python
endef endef

4
lang/python/django-statici18n/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-statici18n PKG_NAME:=django-statici18n
PKG_VERSION:=1.8.2 PKG_VERSION:=1.8.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -26,7 +26,7 @@ define Package/django-statici18n
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=A Django app that provides helper for generating JavaScript catalog to static files. TITLE:=A Django app that provides helper for generating JavaScript catalog to static files.
URL:=https://django-statici18n.readthedocs.org/ URL:=https://django-statici18n.readthedocs.org/
DEPENDS:=+python +django DEPENDS:=+python +python-django
endef endef
define Package/django-statici18n/description define Package/django-statici18n/description

4
lang/python/django-webpack-loader/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=django-webpack-loader PKG_NAME:=django-webpack-loader
PKG_VERSION:=0.6.0 PKG_VERSION:=0.6.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com> PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
@ -26,7 +26,7 @@ define Package/django-webpack-loader
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Transparently use webpack in django TITLE:=Transparently use webpack in django
URL:=https://github.com/owais/django-webpack-loader URL:=https://github.com/owais/django-webpack-loader
DEPENDS:=+python +django DEPENDS:=+python +python-django
VARIANT:=python VARIANT:=python
endef endef

64
lang/python/django/Makefile
View file

@ -21,46 +21,50 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE LICENSE.python PKG_LICENSE_FILES:=LICENSE LICENSE.python
PKG_CPE_ID:=cpe:/a:djangoproject:django PKG_CPE_ID:=cpe:/a:djangoproject:django
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-django-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python-package.mk include ../python-package.mk
include ../python3-package.mk
define Package/django PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
SUBMENU:=Python
SECTION:=lang define Package/django/Default
CATEGORY:=Languages SUBMENU:=Python
TITLE:=The web framework for perfectionists with deadlines. SECTION:=lang
URL:=https://www.djangoproject.com/ CATEGORY:=Languages
DEPENDS:=+python +python-pytz TITLE:=The web framework for perfectionists with deadlines.
URL:=https://www.djangoproject.com/
endef endef
define Package/django/description define Package/python-django
$(call Package/django/Default)
DEPENDS:= \
+PACKAGE_python-django:python \
+PACKAGE_python-django:python-pytz
VARIANT:=python
endef
define Package/python-django/description
The web framework for perfectionists with deadlines. The web framework for perfectionists with deadlines.
endef endef
define Build/Compile define Package/python3-django
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) $(call Package/django/Default)
DEPENDS:= \
+PACKAGE_python3-django:python3 \
+PACKAGE_python3-django:python3-pytz
VARIANT:=python3
endef endef
define Build/InstallDev define Package/python3-django/description
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(call Package/python-django/description)
$(INSTALL_DIR) $(1)/usr/bin .
$(CP) \ (Variant for Python3)
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
$(1)$(PYTHON_PKG_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/django-admin.py \
$(1)/usr/bin
endef endef
define Package/django/install $(eval $(call PyPackage,python-django))
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(eval $(call BuildPackage,python-django))
$(INSTALL_DIR) $(1)/usr/bin
$(CP) \
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
$(1)$(PYTHON_PKG_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/django-admin.py \
$(1)/usr/bin
# fix python exec path
sed -i 's/#!.*/#!\/usr\/bin\/python/g' $(1)/usr/bin/django-admin.py
endef
$(eval $(call BuildPackage,django)) $(eval $(call Py3Package,python3-django))
$(eval $(call BuildPackage,python3-django))

5
net/seafile-seahub/Makefile
View file

@ -23,14 +23,15 @@ include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python-package.mk include ../../lang/python/python-package.mk
SEAFILE_PYTHON_DEPENDS:= \ SEAFILE_PYTHON_DEPENDS:= \
simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \
django
define Package/seafile-seahub define Package/seafile-seahub
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=Seafile server - seahub component TITLE:=Seafile server - seahub component
URL:=https://seafile.com/ URL:=https://seafile.com/
DEPENDS:=+python +pillow +django +django-appconf \ DEPENDS:=+python +pillow +django-appconf \
+django-compressor +django-constance +django-formtools +django-jsonfield \ +django-compressor +django-constance +django-formtools +django-jsonfield \
+django-picklefield +django-postoffice +django-restframework \ +django-picklefield +django-postoffice +django-restframework \
+django-simple-captcha +django-statici18n +django-webpack-loader \ +django-simple-captcha +django-statici18n +django-webpack-loader \