diff options
95 files changed, 89 insertions, 2300 deletions
diff --git a/lang/python/bcrypt/Makefile b/lang/python/bcrypt/Makefile index eb56b00e4..90c53bd63 100644 --- a/lang/python/bcrypt/Makefile +++ b/lang/python/bcrypt/Makefile @@ -16,12 +16,10 @@ PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=libffi/host -HOST_PYTHON_PACKAGE_BUILD_DEPENDS:="cffi>=1.1" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.1" include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/bcrypt/Default @@ -32,15 +30,6 @@ define Package/bcrypt/Default URL:=https://github.com/pyca/bcrypt/ endef -define Package/python-bcrypt -$(call Package/bcrypt/Default) - DEPENDS:= \ - +PACKAGE_python-bcrypt:python \ - +PACKAGE_python-bcrypt:python-cffi \ - +PACKAGE_python-bcrypt:python-six - VARIANT:=python -endef - define Package/python3-bcrypt $(call Package/bcrypt/Default) DEPENDS:= \ @@ -50,20 +39,12 @@ $(call Package/bcrypt/Default) VARIANT:=python3 endef -define Package/python-bcrypt/description - Good password hashing for your software and your servers. -endef - define Package/python3-bcrypt/description -$(call Package/python-bcrypt/description) + Good password hashing for your software and your servers. . (Variant for Python3) endef -$(eval $(call PyPackage,python-bcrypt)) -$(eval $(call BuildPackage,python-bcrypt)) -$(eval $(call BuildPackage,python-bcrypt-src)) - $(eval $(call Py3Package,python3-bcrypt)) $(eval $(call BuildPackage,python3-bcrypt)) $(eval $(call BuildPackage,python3-bcrypt-src)) diff --git a/lang/python/django-appconf/Makefile b/lang/python/django-appconf/Makefile index 34ce696e9..21aee4f8d 100644 --- a/lang/python/django-appconf/Makefile +++ b/lang/python/django-appconf/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-appconf/Default @@ -31,20 +30,6 @@ define Package/django-appconf/Default URL:=https://django-appconf.readthedocs.io endef -define Package/python-django-appconf -$(call Package/django-appconf/Default) - DEPENDS:= \ - +PACKAGE_python-django-appconf:python \ - python-django1 \ - +PACKAGE_python-django-appconf:python-six - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-appconf/description - A helper class for handling configuration defaults of packaged apps gracefully -endef - define Package/python3-django-appconf $(call Package/django-appconf/Default) DEPENDS:= \ @@ -55,15 +40,11 @@ $(call Package/django-appconf/Default) endef define Package/python3-django-appconf/description -$(call Package/python-django-appconf/description) + A helper class for handling configuration defaults of packaged apps gracefully . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-appconf)) -$(eval $(call BuildPackage,python-django-appconf)) -$(eval $(call BuildPackage,python-django-appconf-src)) - $(eval $(call Py3Package,python3-django-appconf)) $(eval $(call BuildPackage,python3-django-appconf)) $(eval $(call BuildPackage,python3-django-appconf-src)) diff --git a/lang/python/django-compressor/Makefile b/lang/python/django-compressor/Makefile index 0c277d362..8f420a153 100644 --- a/lang/python/django-compressor/Makefile +++ b/lang/python/django-compressor/Makefile @@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-compressor/Default @@ -32,24 +31,6 @@ define Package/django-compressor/Default URL:=https://django-compressor.readthedocs.io endef -define Package/python-django-compressor -$(call Package/django-compressor/Default) - DEPENDS:= \ - +PACKAGE_python-django-compressor:python \ - python-django1 \ - +PACKAGE_python-django-compressor:python-django-appconf \ - +PACKAGE_python-django-compressor:python-rcssmin - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-compressor/description - Compresses linked and inline JavaScript or CSS into single cached files. - Note that the JavaScript filter is not being installed as a dependency. - You'll need to build the rjsmin module (it is not par of the openwrt standard - feeds) to use JavaScript functionality. -endef - define Package/python3-django-compressor $(call Package/django-compressor/Default) DEPENDS:= \ @@ -61,15 +42,14 @@ $(call Package/django-compressor/Default) endef define Package/python3-django-compressor/description -$(call Package/python-django-compressor/description) + Compresses linked and inline JavaScript or CSS into single cached files. + Note that the JavaScript filter is not being installed as a dependency. + You'll need to build the rjsmin module (it is not par of the openwrt standard + feeds) to use JavaScript functionality. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-compressor)) -$(eval $(call BuildPackage,python-django-compressor)) -$(eval $(call BuildPackage,python-django-compressor-src)) - $(eval $(call Py3Package,python3-django-compressor)) $(eval $(call BuildPackage,python3-django-compressor)) $(eval $(call BuildPackage,python3-django-compressor-src)) diff --git a/lang/python/django-constance/Makefile b/lang/python/django-constance/Makefile index 1332c44dc..0d5da2aae 100644 --- a/lang/python/django-constance/Makefile +++ b/lang/python/django-constance/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=BSD-3-Clause include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-django-constance/Default @@ -30,19 +29,6 @@ define Package/python-django-constance/Default URL:=https://github.com/jazzband/django-constance endef -define Package/python-django-constance -$(call Package/python-django-constance/Default) - DEPENDS:= \ - +PACKAGE_python-django-constance:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-constance/description - Django live settings with pluggable backends, including Redis. -endef - define Package/python3-django-constance $(call Package/python-django-constance/Default) DEPENDS:= \ @@ -52,15 +38,11 @@ $(call Package/python-django-constance/Default) endef define Package/python3-django-constance/description -$(call Package/python-django-constance/description) + Django live settings with pluggable backends, including Redis. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-constance)) -$(eval $(call BuildPackage,python-django-constance)) -$(eval $(call BuildPackage,python-django-constance-src)) - $(eval $(call Py3Package,python3-django-constance)) $(eval $(call BuildPackage,python3-django-constance)) $(eval $(call BuildPackage,python3-django-constance-src)) diff --git a/lang/python/django-formtools/Makefile b/lang/python/django-formtools/Makefile index c391da958..3bbd46958 100644 --- a/lang/python/django-formtools/Makefile +++ b/lang/python/django-formtools/Makefile @@ -18,7 +18,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-formtools/Default @@ -29,20 +28,6 @@ define Package/django-formtools/Default URL:=https://django-formtools.readthedocs.io endef -define Package/python-django-formtools -$(call Package/django-formtools/Default) - DEPENDS:= \ - +PACKAGE_python-django-formtools:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-formtools/description - Django "formtools" is a set of high-level abstractions for Django forms. - Currently for form previews and multi-step forms. -endef - define Package/python3-django-formtools $(call Package/django-formtools/Default) DEPENDS:= \ @@ -52,15 +37,12 @@ $(call Package/django-formtools/Default) endef define Package/python3-django-formtools/description -$(call Package/python-django-formtools/description) + Django "formtools" is a set of high-level abstractions for Django forms. + Currently for form previews and multi-step forms. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-formtools)) -$(eval $(call BuildPackage,python-django-formtools)) -$(eval $(call BuildPackage,python-django-formtools-src)) - $(eval $(call Py3Package,python3-django-formtools)) $(eval $(call BuildPackage,python3-django-formtools)) $(eval $(call BuildPackage,python3-django-formtools-src)) diff --git a/lang/python/django-jsonfield/Makefile b/lang/python/django-jsonfield/Makefile index 2ed18e8a5..930be5b0d 100644 --- a/lang/python/django-jsonfield/Makefile +++ b/lang/python/django-jsonfield/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-jsonfield/Default @@ -31,21 +30,6 @@ define Package/django-jsonfield/Default 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 \ - +PACKAGE_python-django-jsonfield:python-six - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-jsonfield/description - 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:= \ @@ -56,15 +40,12 @@ $(call Package/django-jsonfield/Default) endef define Package/python3-django-jsonfield/description -$(call Package/python-django-jsonfield/description) + jsonfield is a reusable model field that allows you to store validated + JSON, automatically handling serialization to and from the database. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-jsonfield)) -$(eval $(call BuildPackage,python-django-jsonfield)) -$(eval $(call BuildPackage,python-django-jsonfield-src)) - $(eval $(call Py3Package,python3-django-jsonfield)) $(eval $(call BuildPackage,python3-django-jsonfield)) $(eval $(call BuildPackage,python3-django-jsonfield-src)) diff --git a/lang/python/django-picklefield/Makefile b/lang/python/django-picklefield/Makefile index c240b3f49..da3f4ee05 100644 --- a/lang/python/django-picklefield/Makefile +++ b/lang/python/django-picklefield/Makefile @@ -20,11 +20,8 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk 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)" @@ -36,19 +33,6 @@ define Package/django-picklefield/Default URL:=https://github.com/gintas/django-picklefield/ endef -define Package/python-django-picklefield -$(call Package/django-picklefield/Default) - DEPENDS:= \ - +PACKAGE_python-django-picklefield:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-picklefield/description - Pickled object field for Django -endef - define Package/python3-django-picklefield $(call Package/django-picklefield/Default) DEPENDS:= \ @@ -58,15 +42,11 @@ $(call Package/django-picklefield/Default) endef define Package/python3-django-picklefield/description -$(call Package/python-django-picklefield/description) + Pickled object field for Django . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-picklefield)) -$(eval $(call BuildPackage,python-django-picklefield)) -$(eval $(call BuildPackage,python-django-picklefield-src)) - $(eval $(call Py3Package,python3-django-picklefield)) $(eval $(call BuildPackage,python3-django-picklefield)) $(eval $(call BuildPackage,python3-django-picklefield-src)) diff --git a/lang/python/django-postoffice/Makefile b/lang/python/django-postoffice/Makefile index 20af16ee7..0525f3420 100644 --- a/lang/python/django-postoffice/Makefile +++ b/lang/python/django-postoffice/Makefile @@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=LICENSE.txt include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-postoffice/Default @@ -32,21 +31,6 @@ define Package/django-postoffice/Default URL:=https://github.com/ui/django-post_office endef -define Package/python-django-postoffice -$(call Package/django-postoffice/Default) - DEPENDS:= \ - +PACKAGE_python-django-postoffice:python \ - python-django1 \ - +PACKAGE_python-django-postoffice:python-django-jsonfield - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-postoffice/description - A Django app to monitor and send mail asynchronously, complete with template - support -endef - define Package/python3-django-postoffice $(call Package/django-postoffice/Default) DEPENDS:= \ @@ -57,15 +41,12 @@ $(call Package/django-postoffice/Default) endef define Package/python3-django-postoffice/description -$(call Package/python-django-postoffice/description) + A Django app to monitor and send mail asynchronously, complete with template + support . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-postoffice)) -$(eval $(call BuildPackage,python-django-postoffice)) -$(eval $(call BuildPackage,python-django-postoffice-src)) - $(eval $(call Py3Package,python3-django-postoffice)) $(eval $(call BuildPackage,python3-django-postoffice)) $(eval $(call BuildPackage,python3-django-postoffice-src)) diff --git a/lang/python/django-ranged-response/Makefile b/lang/python/django-ranged-response/Makefile index 896073f62..6006963d2 100644 --- a/lang/python/django-ranged-response/Makefile +++ b/lang/python/django-ranged-response/Makefile @@ -18,7 +18,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-ranged-response/Default @@ -29,19 +28,6 @@ define Package/django-ranged-response/Default URL:=https://github.com/i3thuan5/django-ranged-response endef -define Package/python-django-ranged-response -$(call Package/django-ranged-response/Default) - DEPENDS:= \ - +PACKAGE_python-django-ranged-response:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-ranged-response/description - Modified Django FileResponse that adds Content-Range headers. -endef - define Package/python3-django-ranged-response $(call Package/django-ranged-response/Default) DEPENDS:= \ @@ -51,15 +37,11 @@ $(call Package/django-ranged-response/Default) endef define Package/python3-django-ranged-response/description -$(call Package/python-django-ranged-response/description) + Modified Django FileResponse that adds Content-Range headers. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-ranged-response)) -$(eval $(call BuildPackage,python-django-ranged-response)) -$(eval $(call BuildPackage,python-django-ranged-response-src)) - $(eval $(call Py3Package,python3-django-ranged-response)) $(eval $(call BuildPackage,python3-django-ranged-response)) $(eval $(call BuildPackage,python3-django-ranged-response-src)) diff --git a/lang/python/django-restframework39/Makefile b/lang/python/django-restframework39/Makefile index 5cdb76bfc..6c45abb73 100644 --- a/lang/python/django-restframework39/Makefile +++ b/lang/python/django-restframework39/Makefile @@ -20,7 +20,6 @@ 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 @@ -31,19 +30,6 @@ define Package/django-restframework39/Default 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:= \ @@ -54,15 +40,11 @@ $(call Package/django-restframework39/Default) endef define Package/python3-django-restframework39/description -$(call Package/python-django-restframework39/description) + Web APIs for Django, made easy. (3.9 series) . (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/django-simple-captcha/Makefile b/lang/python/django-simple-captcha/Makefile index a4431aa5f..03f547a45 100644 --- a/lang/python/django-simple-captcha/Makefile +++ b/lang/python/django-simple-captcha/Makefile @@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) @@ -35,23 +34,6 @@ define Package/django-simple-captcha/Default URL:=https://github.com/mbi/django-simple-captcha endef -define Package/python-django-simple-captcha -$(call Package/django-simple-captcha/Default) - DEPENDS:= \ - +PACKAGE_python-django-simple-captcha:python \ - +PACKAGE_python-django-simple-captcha:python-six \ - python-django1 \ - +PACKAGE_python-django-simple-captcha:python-pillow \ - +PACKAGE_python-django-simple-captcha:python-django-ranged-response - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-simple-captcha/description - Django Simple Captcha is an extremely simple, yet highly customizable Django - application to add captcha images to any Django form. -endef - define Package/python3-django-simple-captcha $(call Package/django-simple-captcha/Default) DEPENDS:= \ @@ -64,15 +46,12 @@ $(call Package/django-simple-captcha/Default) endef define Package/python3-django-simple-captcha/description -$(call Package/python-django-simple-captcha/description) + Django Simple Captcha is an extremely simple, yet highly customizable Django + application to add captcha images to any Django form. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-simple-captcha)) -$(eval $(call BuildPackage,python-django-simple-captcha)) -$(eval $(call BuildPackage,python-django-simple-captcha-src)) - $(eval $(call Py3Package,python3-django-simple-captcha)) $(eval $(call BuildPackage,python3-django-simple-captcha)) $(eval $(call BuildPackage,python3-django-simple-captcha-src)) diff --git a/lang/python/django-statici18n/Makefile b/lang/python/django-statici18n/Makefile index 2e86437f7..73872264b 100644 --- a/lang/python/django-statici18n/Makefile +++ b/lang/python/django-statici18n/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-statici18n/Default @@ -31,21 +30,6 @@ define Package/django-statici18n/Default URL:=https://django-statici18n.readthedocs.io endef -define Package/python-django-statici18n -$(call Package/django-statici18n/Default) - DEPENDS:= \ - +PACKAGE_python-django-statici18n:python \ - python-django1 \ - +PACKAGE_python-django-statici18n:python-django-appconf \ - +PACKAGE_python-django-statici18n:python-six - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-statici18n/description - A Django app that provides helper for generating JavaScript catalog to static files. -endef - define Package/python3-django-statici18n $(call Package/django-statici18n/Default) DEPENDS:= \ @@ -57,15 +41,11 @@ $(call Package/django-statici18n/Default) endef define Package/python3-django-statici18n/description -$(call Package/python-django-statici18n/description) + A Django app that provides helper for generating JavaScript catalog to static files. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-statici18n)) -$(eval $(call BuildPackage,python-django-statici18n)) -$(eval $(call BuildPackage,python-django-statici18n-src)) - $(eval $(call Py3Package,python3-django-statici18n)) $(eval $(call BuildPackage,python3-django-statici18n)) $(eval $(call BuildPackage,python3-django-statici18n-src)) diff --git a/lang/python/django-webpack-loader/Makefile b/lang/python/django-webpack-loader/Makefile index 90c65d2ac..d21f0268b 100644 --- a/lang/python/django-webpack-loader/Makefile +++ b/lang/python/django-webpack-loader/Makefile @@ -18,7 +18,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django-webpack-loader/Default @@ -29,19 +28,6 @@ define Package/django-webpack-loader/Default URL:=https://github.com/owais/django-webpack-loader endef -define Package/python-django-webpack-loader -$(call Package/django-webpack-loader/Default) - DEPENDS:= \ - +PACKAGE_python-django-webpack-loader:python \ - python-django1 - VARIANT:=python - MDEPENDS:=python-django1 -endef - -define Package/python-django-webpack-loader/description - Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers. -endef - define Package/python3-django-webpack-loader $(call Package/django-webpack-loader/Default) DEPENDS:= \ @@ -51,15 +37,11 @@ $(call Package/django-webpack-loader/Default) endef define Package/python3-django-webpack-loader/description -$(call Package/python-django-webpack-loader/description) + Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers. . (Variant for Python3) endef -$(eval $(call PyPackage,python-django-webpack-loader)) -$(eval $(call BuildPackage,python-django-webpack-loader)) -$(eval $(call BuildPackage,python-django-webpack-loader-src)) - $(eval $(call Py3Package,python3-django-webpack-loader)) $(eval $(call BuildPackage,python3-django-webpack-loader)) $(eval $(call BuildPackage,python3-django-webpack-loader-src)) diff --git a/lang/python/django1/Makefile b/lang/python/django1/Makefile index db260a208..d3599e962 100644 --- a/lang/python/django1/Makefile +++ b/lang/python/django1/Makefile @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:djangoproject:django include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/django1/Default @@ -32,20 +31,6 @@ define Package/django1/Default URL:=https://www.djangoproject.com/ endef -define Package/python-django1 -$(call Package/django1/Default) - DEPENDS:= \ - +PACKAGE_python-django1:python \ - +PACKAGE_python-django1:python-pytz \ - +PACKAGE_python-django1:python-django1-common - VARIANT:=python - MENU:=1 -endef - -define Package/python-django1/description - The web framework for perfectionists with deadlines (LTS 1.11 series). -endef - define Package/python3-django1 $(call Package/django1/Default) DEPENDS:= \ @@ -57,7 +42,7 @@ $(call Package/django1/Default) endef define Package/python3-django1/description -$(call Package/python-django1/description) + The web framework for perfectionists with deadlines (LTS 1.11 series). . (Variant for Python3) endef @@ -67,12 +52,11 @@ $(call Package/django1/Default) endef define Package/python-django1-common/description -$(call Package/python-django1/description) + The web framework for perfectionists with deadlines (LTS 1.11 series). . This package contains files common to both Python 2.7 and Python 3. endef -PyPackage/python-django1/install:=: Py3Package/python3-django1/install:=: define Package/python-django1-common/install @@ -80,10 +64,6 @@ define Package/python-django1-common/install $(INSTALL_BIN) ./files/django-admin $(1)/usr/bin endef -$(eval $(call PyPackage,python-django1)) -$(eval $(call BuildPackage,python-django1)) -$(eval $(call BuildPackage,python-django1-src)) - $(eval $(call Py3Package,python3-django1)) $(eval $(call BuildPackage,python3-django1)) $(eval $(call BuildPackage,python3-django1-src)) diff --git a/lang/python/flup/Makefile b/lang/python/flup/Makefile index 504b082a3..819346896 100644 --- a/lang/python/flup/Makefile +++ b/lang/python/flup/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=PKG-INFO include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/flup/Default @@ -31,14 +30,6 @@ define Package/flup/Default URL:=https://www.saddi.com/software/flup/ endef -define Package/python-flup -$(call Package/flup/Default) - DEPENDS+= \ - +PACKAGE_python-flup:python-light \ - +PACKAGE_python-flup:python-logging - VARIANT:=python -endef - define Package/python3-flup $(call Package/flup/Default) DEPENDS+= \ @@ -47,20 +38,12 @@ $(call Package/flup/Default) VARIANT:=python3 endef -define Package/python-flup/description - Random assortment of WSGI servers. -endef - define Package/python3-flup/description -$(call Package/python-flup/description) + Random assortment of WSGI servers. . (Variant for Python3) endef -$(eval $(call PyPackage,python-flup)) -$(eval $(call BuildPackage,python-flup)) -$(eval $(call BuildPackage,python-flup-src)) - $(eval $(call Py3Package,python3-flup)) $(eval $(call BuildPackage,python3-flup)) $(eval $(call BuildPackage,python3-flup-src)) diff --git a/lang/python/gunicorn/Makefile b/lang/python/gunicorn/Makefile index 1e65f4d1e..5a82924e2 100644 --- a/lang/python/gunicorn/Makefile +++ b/lang/python/gunicorn/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/gunicorn/Default @@ -31,21 +30,6 @@ define Package/gunicorn/Default URL:=https://gunicorn.org endef -define Package/python-gunicorn -$(call Package/gunicorn/Default) - DEPENDS:=+python - VARIANT:=python -endef - -define Package/python-gunicorn/description - WSGI HTTP Server for UNIX (libraries) -endef - -define PyPackage/python-gunicorn/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/gunicorn/workers/_gaiohttp.py -endef - define Package/python3-gunicorn $(call Package/gunicorn/Default) DEPENDS:=+python3 @@ -53,43 +37,24 @@ $(call Package/gunicorn/Default) endef define Package/python3-gunicorn/description -$(call Package/python-gunicorn/description) + WSGI HTTP Server for UNIX (libraries) . (Variant for Python3) endef # Make sure that the binaries are not installed with the libraries -# That means adding some empty Py[3]Package/gunicorn[3]/install rules -define PyPackage/python-gunicorn/install - : -endef - +# That means adding some empty Py3Package/gunicorn3/install rules define Py3Package/python3-gunicorn/install : endef -define Package/gunicorn -$(call Package/gunicorn/Default) - DEPENDS:=+python +python-pkg-resources +python-gunicorn -endef - -define Package/gunicorn/description - WSGI HTTP Server for UNIX (daemon) -endef - -define Package/gunicorn/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - $(call PyShebang,$(1)/usr/bin/*) -endef - define Package/gunicorn3 $(call Package/gunicorn/Default) DEPENDS:=+python3 +python3-pkg-resources +python3-gunicorn endef define Package/gunicorn3/description -$(call Package/gunicorn/description) + WSGI HTTP Server for UNIX (daemon) . (Variant for Python3) endef @@ -105,11 +70,6 @@ define Package/gunicorn3/install $(call Py3Shebang,$(1)/usr/bin/*) endef -$(eval $(call PyPackage,python-gunicorn)) -$(eval $(call BuildPackage,python-gunicorn)) -$(eval $(call BuildPackage,python-gunicorn-src)) -$(eval $(call BuildPackage,gunicorn)) - $(eval $(call Py3Package,python3-gunicorn)) $(eval $(call BuildPackage,python3-gunicorn)) $(eval $(call BuildPackage,python3-gunicorn-src)) diff --git a/lang/python/openpyxl/Makefile b/lang/python/openpyxl/Makefile index f0ea9326b..4d292d7f4 100644 --- a/lang/python/openpyxl/Makefile +++ b/lang/python/openpyxl/Makefile @@ -20,7 +20,6 @@ PKG_HASH:=1d2af392cef8c8227bd2ac3ebe3a28b25aba74fd4fa473ce106065f0b73bfe2e include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-openpyxl/Default @@ -31,18 +30,6 @@ define Package/python-openpyxl/Default URL:=https://openpyxl.readthedocs.org/ endef -define Package/python-openpyxl - $(call Package/python-openpyxl/Default) - DEPENDS:= \ - +PACKAGE_python-openpyxl:python \ - +PACKAGE_python-openpyxl:python-defusedxml \ - +PACKAGE_python-openpyxl:python-et_xmlfile \ - +PACKAGE_python-openpyxl:python-jdcal - VARIANT:=python - # The PROVIDES below is deprecated and should be dropped with the next version. - PROVIDES:=openpyxl -endef - define Package/python3-openpyxl $(call Package/python-openpyxl/Default) DEPENDS:= \ @@ -53,20 +40,12 @@ define Package/python3-openpyxl VARIANT:=python3 endef -define Package/python-openpyxl/description - A Python library to read/write Excel 2010 xlsx/xlsm files -endef - define Package/python3-openpyxl/description -$(call Package/python-openpyxl/description) + A Python library to read/write Excel 2010 xlsx/xlsm files . (Variant for Python3) endef -$(eval $(call PyPackage,python-openpyxl)) -$(eval $(call BuildPackage,python-openpyxl)) -$(eval $(call BuildPackage,python-openpyxl-src)) - $(eval $(call Py3Package,python3-openpyxl)) $(eval $(call BuildPackage,python3-openpyxl)) $(eval $(call BuildPackage,python3-openpyxl-src)) diff --git a/lang/python/passlib/Makefile b/lang/python/passlib/Makefile index 144939f06..bba473f68 100644 --- a/lang/python/passlib/Makefile +++ b/lang/python/passlib/Makefile @@ -14,7 +14,6 @@ PKG_HASH:=8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/passlib/Default @@ -25,37 +24,24 @@ define Package/passlib/Default URL:=https://bitbucket.org/ecollins/passlib endef -define Package/python-passlib -$(call Package/passlib/Default) - DEPENDS:=+PACKAGE_python-passlib:python +PACKAGE_python-passlib:python-dateutil - VARIANT:=python -endef - define Package/python3-passlib $(call Package/passlib/Default) DEPENDS:=+PACKAGE_python3-passlib:python3 +PACKAGE_python3-passlib:python3-dateutil VARIANT:=python3 endef -define Package/python-passlib/description +define Package/python3-passlib/description Passlib is a password hashing library for Python 2 & 3, which provides cross-platform implementations of over 30 password hashing algorithms, as well as a framework for managing existing password hashes. It’s designed to be useful for a wide range of tasks, from verifying a hash found in /etc/shadow, to providing full-strength password hashing for multi-user applications. -endef - -define Package/python3-passlib/description -$(call Package/python-passlib/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-passlib)) $(eval $(call Py3Package,python3-passlib)) -$(eval $(call BuildPackage,python-passlib)) -$(eval $(call BuildPackage,python-passlib-src)) $(eval $(call BuildPackage,python3-passlib)) $(eval $(call BuildPackage,python3-passlib-src)) diff --git a/lang/python/pillow/Makefile b/lang/python/pillow/Makefile index e51fc016f..380c5e389 100644 --- a/lang/python/pillow/Makefile +++ b/lang/python/pillow/Makefile @@ -20,7 +20,6 @@ PKG_CPE_ID:=cpe:/a:python:pillow include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pillow/Default @@ -32,16 +31,6 @@ define Package/python-pillow/Default DEPENDS:=+libfreetype +libjpeg +libtiff +zlib endef -define Package/python-pillow -$(call Package/python-pillow/Default) - DEPENDS+=+PACKAGE_python-pillow:python - VARIANT:=python -endef - -define Package/python-pillow/description - The friendly PIL fork -endef - define Package/python3-pillow $(call Package/python-pillow/Default) DEPENDS+=+PACKAGE_python3-pillow:python3 @@ -49,7 +38,7 @@ $(call Package/python-pillow/Default) endef define Package/python3-pillow/description -$(call Package/python-pillow/description) + The friendly PIL fork . (Variant for Python3) endef @@ -66,12 +55,6 @@ PYTHON3_PKG_SETUP_GLOBAL_ARGS += build_ext \ --disable-imagequant \ --disable-platform-guessing -PYTHON_PKG_SETUP_GLOBAL_ARGS:=$(PYTHON3_PKG_SETUP_GLOBAL_ARGS) - -$(eval $(call PyPackage,python-pillow)) -$(eval $(call BuildPackage,python-pillow)) -$(eval $(call BuildPackage,python-pillow-src)) - $(eval $(call Py3Package,python3-pillow)) $(eval $(call BuildPackage,python3-pillow)) $(eval $(call BuildPackage,python3-pillow-src)) diff --git a/lang/python/pyjwt/Makefile b/lang/python/pyjwt/Makefile index b8000308b..b4745b631 100644 --- a/lang/python/pyjwt/Makefile +++ b/lang/python/pyjwt/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyjwt/Default @@ -29,32 +28,18 @@ define Package/python-pyjwt/Default URL:=http://github.com/jpadilla/pyjwt endef -define Package/python-pyjwt - $(call Package/python-pyjwt/Default) - DEPENDS:=+PACKAGE_python-pyjwt:python - VARIANT:=python -endef - define Package/python3-pyjwt $(call Package/python-pyjwt/Default) DEPENDS:=+PACKAGE_python3-pyjwt:python3 VARIANT:=python3 endef -define Package/python-pyjwt/description - A Python implementation of RFC 7519. -endef - define Package/python3-pyjwt/description -$(call Package/python-pyjwt/description) + A Python implementation of RFC 7519. . (Variant for Python3) endef -$(eval $(call PyPackage,python-pyjwt)) -$(eval $(call BuildPackage,python-pyjwt)) -$(eval $(call BuildPackage,python-pyjwt-src)) - $(eval $(call Py3Package,python3-pyjwt)) $(eval $(call BuildPackage,python3-pyjwt)) $(eval $(call BuildPackage,python3-pyjwt-src)) diff --git a/lang/python/pyodbc/Makefile b/lang/python/pyodbc/Makefile index fa70c8f6b..87ca5c936 100644 --- a/lang/python/pyodbc/Makefile +++ b/lang/python/pyodbc/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:=2 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=e52700b5d24a846483b5ab80acd9153f8e593999c9184ffea11596288fb33de3 -PKG_BUILD_DEPENDS:=python python3 unixodbc +PKG_BUILD_DEPENDS:=python3 unixodbc PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> @@ -20,7 +20,6 @@ PKG_BUILD_DEPENDS:=unixodbc/host include ../pypi.mk include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyodbc/Default @@ -31,15 +30,6 @@ define Package/python-pyodbc/Default DEPENDS:=+unixodbc $(CXX_DEPENDS) endef -define Package/python-pyodbc -$(call Package/python-pyodbc/Default) - TITLE:=python-pyodbc - DEPENDS+=+PACKAGE_python-pyodbc:python-light \ - +PACKAGE_python-pyodbc:python-logging \ - +PACKAGE_python-pyodbc:python-openssl - VARIANT:=python -endef - define Package/python3-pyodbc $(call Package/python-pyodbc/Default) TITLE:=python3-pyodbc @@ -47,21 +37,14 @@ $(call Package/python-pyodbc/Default) VARIANT:=python3 endef -define Package/python-pyodbc/description +define Package/python3-pyodbc/description DB API Module for ODBC A Python DB API 2 module for ODBC. This project provides an up-to-date, convenient interface to ODBC using native data types like datetime and decimal. -endef - -define Package/python3-pyodbc/description -$(call Package/python-pyodbc/description) (Variant for Python3) endef -$(eval $(call PyPackage,python-pyodbc)) -$(eval $(call BuildPackage,python-pyodbc)) - $(eval $(call Py3Package,python3-pyodbc)) $(eval $(call BuildPackage,python3-pyodbc)) diff --git a/lang/python/python-astral/Makefile b/lang/python/python-astral/Makefile index 302eefc72..35825e8aa 100644 --- a/lang/python/python-astral/Makefile +++ b/lang/python/python-astral/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-astral/Default @@ -31,14 +30,6 @@ define Package/python-astral/Default URL:=https://github.com/sffjunkie/astral endef -define Package/python-astral -$(call Package/python-astral/Default) - DEPENDS+= \ - +PACKAGE_python-astral:python-light \ - +PACKAGE_python-astral:python-pytz - VARIANT:=python -endef - define Package/python3-astral $(call Package/python-astral/Default) DEPENDS+= \ @@ -47,20 +38,12 @@ $(call Package/python-astral/Default) VARIANT:=python3 endef -define Package/python-astral/description -Astral is a python module for calculating the times of various aspects of the sun and moon. -endef - define Package/python3-astral/description -$(call Package/python-astral/description) +Astral is a python module for calculating the times of various aspects of the sun and moon. . (Variant for Python3) endef -$(eval $(call PyPackage,python-astral)) -$(eval $(call BuildPackage,python-astral)) -$(eval $(call BuildPackage,python-astral-src)) - $(eval $(call Py3Package,python3-astral)) $(eval $(call BuildPackage,python3-astral)) $(eval $(call BuildPackage,python3-astral-src)) diff --git a/lang/python/python-attrs/Makefile b/lang/python/python-attrs/Makefile index 5936704cb..82fc5d4bd 100644 --- a/lang/python/python-attrs/Makefile +++ b/lang/python/python-attrs/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-attrs/Default @@ -31,34 +30,20 @@ define Package/python-attrs/Default URL:=https://www.attrs.org/ endef -define Package/python-attrs -$(call Package/python-attrs/Default) - DEPENDS:=+PACKAGE_python-attrs:python-light - VARIANT:=python -endef - define Package/python3-attrs $(call Package/python-attrs/Default) DEPENDS:=+PACKAGE_python3-attrs:python3-light VARIANT:=python3 endef -define Package/python-attrs/description +define Package/python3-attrs/description attrs is an MIT-licensed Python package with class decorators that ease the chores of implementing the most common attribute-related object protocols. -endef - -define Package/python3-attrs/description -$(call Package/python-attrs/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-attrs)) -$(eval $(call BuildPackage,python-attrs)) -$(eval $(call BuildPackage,python-attrs-src)) - $(eval $(call Py3Package,python3-attrs)) $(eval $(call BuildPackage,python3-attrs)) $(eval $(call BuildPackage,python3-attrs-src)) diff --git a/lang/python/python-automat/Makefile b/lang/python/python-automat/Makefile index 804d3c881..b399ec03f 100644 --- a/lang/python/python-automat/Makefile +++ b/lang/python/python-automat/Makefile @@ -20,11 +20,8 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk 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)" @@ -36,15 +33,6 @@ define Package/python-automat/Default URL:=https://github.com/glyph/Automat endef -define Package/python-automat -$(call Package/python-automat/Default) - DEPENDS:= \ - +PACKAGE_python-automat:python-light \ - +PACKAGE_python-automat:python-attrs \ - +PACKAGE_python-automat:python-six - VARIANT:=python -endef - define Package/python3-automat $(call Package/python-automat/Default) DEPENDS:= \ @@ -54,32 +42,19 @@ $(call Package/python-automat/Default) VARIANT:=python3 endef -define Package/python-automat/description +define Package/python3-automat/description Automat is a library for concise, idiomatic Python expression of finite-state automata (particularly deterministic finite-state transducers). -endef - -define Package/python3-automat/description -$(call Package/python-automat/description) . (Variant for Python3) endef -define PyPackage/python-automat/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/automat/_visualize.py -endef - define Py3Package/python3-automat/filespec +|$(PYTHON3_PKG_DIR) -|$(PYTHON3_PKG_DIR)/automat/_visualize.py endef -$(eval $(call PyPackage,python-automat)) -$(eval $(call BuildPackage,python-automat)) -$(eval $(call BuildPackage,python-automat-src)) - $(eval $(call Py3Package,python3-automat)) $(eval $(call BuildPackage,python3-automat)) $(eval $(call BuildPackage,python3-automat-src)) diff --git a/lang/python/python-awscli/Makefile b/lang/python/python-awscli/Makefile index 164ed090d..537b5c78b 100644 --- a/lang/python/python-awscli/Makefile +++ b/lang/python/python-awscli/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-awscli/Default @@ -23,19 +22,6 @@ define Package/python-awscli/Default URL:=https://github.com/aws/aws-cli endef -define Package/python-awscli -$(call Package/python-awscli/Default) - DEPENDS:=+PACKAGE_python-awscli:python \ - +PACKAGE_python-awscli:python-yaml \ - +PACKAGE_python-awscli:python-pyasn1 \ - +PACKAGE_python-awscli:python-botocore \ - +PACKAGE_python-awscli:python-rsa \ - +PACKAGE_python-awscli:python-colorama \ - +PACKAGE_python-awscli:python-docutils \ - +PACKAGE_python-awscli:python-s3transfer - VARIANT:=python -endef - define Package/python3-awscli $(call Package/python-awscli/Default) DEPENDS:=+PACKAGE_python3-awscli:python3 \ @@ -49,20 +35,12 @@ $(call Package/python-awscli/Default) VARIANT:=python3 endef -define Package/python-awscli/description -This package provides a unified command line interface to Amazon Web Services. -endef - define Package/python3-awscli/description -$(call Package/python-awscli/description) +This package provides a unified command line interface to Amazon Web Services. . (Variant for Python3) endef -$(eval $(call PyPackage,python-awscli)) -$(eval $(call BuildPackage,python-awscli)) -$(eval $(call BuildPackage,python-awscli-src)) - $(eval $(call Py3Package,python3-awscli)) $(eval $(call BuildPackage,python3-awscli)) $(eval $(call BuildPackage,python3-awscli-src)) diff --git a/lang/python/python-botocore/Makefile b/lang/python/python-botocore/Makefile index d230176b9..505dbe1f9 100644 --- a/lang/python/python-botocore/Makefile +++ b/lang/python/python-botocore/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-botocore/Default @@ -23,17 +22,6 @@ define Package/python-botocore/Default URL:=https://github.com/boto/botocore endef -define Package/python-botocore -$(call Package/python-botocore/Default) - DEPENDS:=+PACKAGE_python-botocore:python \ - +PACKAGE_python-botocore:python-urllib3 \ - +PACKAGE_python-botocore:python-docutils \ - +PACKAGE_python-botocore:python-dateutil \ - +PACKAGE_python-botocore:python-jmespath \ - +PACKAGE_python-botocore:python-requests - VARIANT:=python -endef - define Package/python3-botocore $(call Package/python-botocore/Default) DEPENDS:=+PACKAGE_python3-botocore:python3 \ @@ -45,21 +33,13 @@ $(call Package/python-botocore/Default) VARIANT:=python3 endef -define Package/python-botocore/description +define Package/python3-botocore/description A low-level interface to a growing number of Amazon Web Services. The botocore package is the foundation for the AWS CLI as well as boto3. -endef - -define Package/python3-botocore/description -$(call Package/python-botocore/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-botocore)) -$(eval $(call BuildPackage,python-botocore)) -$(eval $(call BuildPackage,python-botocore-src)) - $(eval $(call Py3Package,python3-botocore)) $(eval $(call BuildPackage,python3-botocore)) $(eval $(call BuildPackage,python3-botocore-src)) diff --git a/lang/python/python-certifi/Makefile b/lang/python/python-certifi/Makefile index 640099b71..914bce87b 100644 --- a/lang/python/python-certifi/Makefile +++ b/lang/python/python-certifi/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-certifi/Default @@ -29,33 +28,19 @@ define Package/python-certifi/Default URL:=http://certifi.io/ endef -define Package/python-certifi - $(call Package/python-certifi/Default) - DEPENDS:=+PACKAGE_python-certifi:python-light - VARIANT:=python -endef - define Package/python3-certifi $(call Package/python-certifi/Default) DEPENDS:=+PACKAGE_python3-certifi:python3-light VARIANT:=python3 endef -define Package/python-certifi/description +define Package/python3-certifi/description Certifi is a carefully curated collection of Root Certificates for validating the trustworthiness of SSL certificates while verifying the identity of TLS hosts. -endef - -define Package/python3-certifi/description -$(call Package/python-certifi/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-certifi)) -$(eval $(call BuildPackage,python-certifi)) -$(eval $(call BuildPackage,python-certifi-src)) - $(eval $(call Py3Package,python3-certifi)) $(eval $(call BuildPackage,python3-certifi)) $(eval $(call BuildPackage,python3-certifi-src)) diff --git a/lang/python/python-cffi/Makefile b/lang/python/python-cffi/Makefile index 8a9733930..77b5fd7d1 100644 --- a/lang/python/python-cffi/Makefile +++ b/lang/python/python-cffi/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleana include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-cffi/Default @@ -32,14 +31,6 @@ define Package/python-cffi/Default DEPENDS:=+libffi endef -define Package/python-cffi -$(call Package/python-cffi/Default) - DEPENDS+= \ - +PACKAGE_python-cffi:python-light \ - +PACKAGE_python-cffi:python-pycparser - VARIANT:=python -endef - define Package/python3-cffi $(call Package/python-cffi/Default) DEPENDS+= \ @@ -48,20 +39,12 @@ $(call Package/python-cffi/Default) VARIANT:=python3 endef -define Package/python-cffi/description -Foreign Function Interface for Python calling C code. -endef - define Package/python3-cffi/description -$(call Package/python-cffi/description) +Foreign Function Interface for Python calling C code. . (Variant for Python3) endef -$(eval $(call PyPackage,python-cffi)) -$(eval $(call BuildPackage,python-cffi)) -$(eval $(call BuildPackage,python-cffi-src)) - $(eval $(call Py3Package,python3-cffi)) $(eval $(call BuildPackage,python3-cffi)) $(eval $(call BuildPackage,python3-cffi-src)) diff --git a/lang/python/python-chardet/Makefile b/lang/python/python-chardet/Makefile index 8f2da9e42..956491cb7 100644 --- a/lang/python/python-chardet/Makefile +++ b/lang/python/python-chardet/Makefile @@ -17,7 +17,6 @@ PKG_HASH:=84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-chardet/Default @@ -28,13 +27,6 @@ define Package/python-chardet/Default URL:=https://github.com/chardet/chardet endef -define Package/python-chardet -$(call Package/python-chardet/Default) - TITLE:=Universal encoding detector for Python 2 - DEPENDS:=+PACKAGE_python-chardet:python - VARIANT:=python -endef - define Package/python3-chardet $(call Package/python-chardet/Default) TITLE:=Universal encoding detector for Python3 @@ -42,12 +34,8 @@ $(call Package/python-chardet/Default) VARIANT:=python3 endef -define Package/python-chardet/description - Universal encoding detector for Python 2 and 3 -endef - define Package/python3-chardet/description -$(call Package/python-chardet/description) + Universal encoding detector for Python 2 and 3 . (Variant for Python3) endef @@ -60,10 +48,6 @@ define Py3Package/python3-chardet/install done endef -$(eval $(call PyPackage,python-chardet)) -$(eval $(call BuildPackage,python-chardet)) -$(eval $(call BuildPackage,python-chardet-src)) - $(eval $(call Py3Package,python3-chardet)) $(eval $(call BuildPackage,python3-chardet)) $(eval $(call BuildPackage,python3-chardet-src)) diff --git a/lang/python/python-colorama/Makefile b/lang/python/python-colorama/Makefile index 61c862dee..d81d50c7a 100644 --- a/lang/python/python-colorama/Makefile +++ b/lang/python/python-colorama/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-colorama/Default @@ -23,33 +22,19 @@ define Package/python-colorama/Default URL:=https://github.com/tartley/colorama endef -define Package/python-colorama -$(call Package/python-colorama/Default) - DEPENDS:=+PACKAGE_python-colorama:python - VARIANT:=python -endef - define Package/python3-colorama $(call Package/python-colorama/Default) DEPENDS:=+PACKAGE_python3-colorama:python3 VARIANT:=python3 endef -define Package/python-colorama/description +define Package/python3-colorama/description Makes ANSI escape character sequences (for producing colored terminal text and cursor positioning) work under MS Windows. -endef - -define Package/python3-colorama/description -$(call Package/python-colorama/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-colorama)) -$(eval $(call BuildPackage,python-colorama)) -$(eval $(call BuildPackage,python-colorama-src)) - $(eval $(call Py3Package,python3-colorama)) $(eval $(call BuildPackage,python3-colorama)) $(eval $(call BuildPackage,python3-colorama-src)) diff --git a/lang/python/python-constantly/Makefile b/lang/python/python-constantly/Makefile index e26705f4f..c0efca096 100644 --- a/lang/python/python-constantly/Makefile +++ b/lang/python/python-constantly/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-constantly/Default @@ -31,34 +30,20 @@ define Package/python-constantly/Default URL:=https://github.com/twisted/constantly endef -define Package/python-constantly -$(call Package/python-constantly/Default) - DEPENDS:=+PACKAGE_python-constantly:python-light - VARIANT:=python -endef - define Package/python3-constantly $(call Package/python-constantly/Default) DEPENDS:=+PACKAGE_python3-constantly:python3-light VARIANT:=python3 endef -define Package/python-constantly/description +define Package/python3-constantly/description A library that provides symbolic constant support. It includes collections and constants with text, numeric, and bit flag values. Originally twisted.python.constants from the Twisted project. -endef - -define Package/python3-constantly/description -$(call Package/python-constantly/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-constantly)) -$(eval $(call BuildPackage,python-constantly)) -$(eval $(call BuildPackage,python-constantly-src)) - $(eval $(call Py3Package,python3-constantly)) $(eval $(call BuildPackage,python3-constantly)) $(eval $(call BuildPackage,python3-constantly-src)) diff --git a/lang/python/python-crcmod/Makefile b/lang/python/python-crcmod/Makefile deleted file mode 100644 index 818fa72ea..000000000 --- a/lang/python/python-crcmod/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (C) 2015 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:=python-crcmod -PKG_VERSION:=1.7 -PKG_RELEASE:=1 -PKG_MAINTAINER:=Micke Prag <micke.prag@telldus.se> -PKG_LICENSE:=MIT - -PYPI_NAME:=crcmod -PKG_HASH:=dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e - -PKG_BUILD_DEPENDS:=python - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-crcmod - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=python-crcmod - URL:=http://crcmod.sourceforge.net/ - DEPENDS:=+python-light -endef - -define Package/python-crcmod/description - The software in this package is a Python module for generating objects that compute the Cyclic Redundancy Check (CRC). There is no attempt in this package to explain how the CRC works. There are a number of resources on the web that give a good explanation of the algorithms. Just do a Google search for "crc calculation" and browse till you find what you need. Another resource can be found in chapter 20 of the book "Numerical Recipes in C" by Press et. al. -endef - -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") -endef - -define Package/python-crcmod/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,python-crcmod)) diff --git a/lang/python/python-crypto/Makefile b/lang/python/python-crypto/Makefile index 94eb78a45..8ee28e025 100644 --- a/lang/python/python-crypto/Makefile +++ b/lang/python/python-crypto/Makefile @@ -21,13 +21,8 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -PYTHON_PKG_SETUP_ARGS:= -PYTHON_PKG_SETUP_VARS:= \ - CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" - PYTHON3_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_VARS:= \ CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" @@ -41,33 +36,19 @@ define Package/python-crypto/Default DEPENDS:=+libgmp endef -define Package/python-crypto -$(call Package/python-crypto/Default) - DEPENDS+=+PACKAGE_python-crypto:python - VARIANT:=python -endef - define Package/python3-crypto $(call Package/python-crypto/Default) DEPENDS+=+PACKAGE_python3-crypto:python3 VARIANT:=python3 endef -define Package/python-crypto/description +define Package/python3-crypto/description A collection of both secure hash functions (such as MD5 and SHA), and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.). -endef - -define Package/python3-crypto/description -$(call Package/python-crypto/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-crypto)) -$(eval $(call BuildPackage,python-crypto)) -$(eval $(call BuildPackage,python-crypto-src)) - $(eval $(call Py3Package,python3-crypto)) $(eval $(call BuildPackage,python3-crypto)) $(eval $(call BuildPackage,python3-crypto-src)) diff --git a/lang/python/python-cryptodome/Makefile b/lang/python/python-cryptodome/Makefile index f6d1e88a9..2e2d9f5f7 100644 --- a/lang/python/python-cryptodome/Makefile +++ b/lang/python/python-cryptodome/Makefile @@ -18,13 +18,8 @@ PKG_CPE_ID:=cpe:/a:pycryptodome:pycryptodome include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -PYTHON_PKG_SETUP_ARGS:= -PYTHON_PKG_SETUP_VARS:= \ - CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" - PYTHON3_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_VARS:= \ CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" @@ -38,13 +33,6 @@ define Package/python-cryptodome/Default DEPENDS:=+libgmp endef -define Package/python-cryptodome -$(call Package/python-cryptodome/Default) - DEPENDS+=+PACKAGE_python-cryptodome:python - VARIANT:=python - CONFLICTS:=python-crypto -endef - define Package/python3-cryptodome $(call Package/python-cryptodome/Default) DEPENDS+=+PACKAGE_python3-cryptodome:python3 @@ -52,21 +40,13 @@ $(call Package/python-cryptodome/Default) CONFLICTS:=python3-crypto endef -define Package/python-cryptodome/description +define Package/python3-cryptodome/description PyCryptodome is a self-contained Python package of low-level cryptographic primitives. -endef - -define Package/python3-cryptodome/description -$(call Package/python-cryptodome/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-cryptodome)) -$(eval $(call BuildPackage,python-cryptodome)) -$(eval $(call BuildPackage,python-cryptodome-src)) - $(eval $(call Py3Package,python3-cryptodome)) $(eval $(call BuildPackage,python3-cryptodome)) $(eval $(call BuildPackage,python3-cryptodome-src)) diff --git a/lang/python/python-cryptodomex/Makefile b/lang/python/python-cryptodomex/Makefile index 10c68e7d2..191d8083b 100644 --- a/lang/python/python-cryptodomex/Makefile +++ b/lang/python/python-cryptodomex/Makefile @@ -17,13 +17,8 @@ PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -PYTHON_PKG_SETUP_ARGS:= -PYTHON_PKG_SETUP_VARS:= \ - CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" - PYTHON3_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_VARS:= \ CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" @@ -37,33 +32,19 @@ define Package/python-cryptodomex/Default DEPENDS:=+libgmp endef -define Package/python-cryptodomex -$(call Package/python-cryptodomex/Default) - DEPENDS+=+PACKAGE_python-cryptodomex:python - VARIANT:=python -endef - define Package/python3-cryptodomex $(call Package/python-cryptodomex/Default) DEPENDS+=+PACKAGE_python3-cryptodomex:python3 VARIANT:=python3 endef -define Package/python-cryptodomex/description +define Package/python3-cryptodomex/description PyCryptodome is a self-contained Python package of low-level cryptographic primitives. -endef - -define Package/python3-cryptodomex/description -$(call Package/python-cryptodomex/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-cryptodomex)) -$(eval $(call BuildPackage,python-cryptodomex)) -$(eval $(call BuildPackage,python-cryptodomex-src)) - $(eval $(call Py3Package,python3-cryptodomex)) $(eval $(call BuildPackage,python3-cryptodomex)) $(eval $(call BuildPackage,python3-cryptodomex-src)) diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile index d7981d37d..8552903f5 100644 --- a/lang/python/python-cryptography/Makefile +++ b/lang/python/python-cryptography/Makefile @@ -20,12 +20,10 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleana PKG_BUILD_DEPENDS:=libffi/host -HOST_PYTHON_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3" include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-cryptography/Default @@ -37,17 +35,6 @@ define Package/python-cryptography/Default DEPENDS:=+libopenssl endef -define Package/python-cryptography -$(call Package/python-cryptography/Default) - DEPENDS+= \ - +PACKAGE_python-cryptography:python \ - +PACKAGE_python-cryptography:python-cffi \ - +PACKAGE_python-cryptography:python-enum34 \ - +PACKAGE_python-cryptography:python-ipaddress \ - +PACKAGE_python-cryptography:python-six - VARIANT:=python -endef - define Package/python3-cryptography $(call Package/python-cryptography/Default) DEPENDS+= \ @@ -57,22 +44,14 @@ $(call Package/python-cryptography/Default) VARIANT:=python3 endef -define Package/python-cryptography/description +define Package/python3-cryptography/description cryptography is a package which provides cryptographic recipes and primitives to Python developers. Our goal is for it to be your "cryptographic standard library". It supports Python 2.6-2.7, Python 3.3+, and PyPy 2.6+. -endef - -define Package/python3-cryptography/description -$(call Package/python-cryptography/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-cryptography)) -$(eval $(call BuildPackage,python-cryptography)) -$(eval $(call BuildPackage,python-cryptography-src)) - $(eval $(call Py3Package,python3-cryptography)) $(eval $(call BuildPackage,python3-cryptography)) $(eval $(call BuildPackage,python3-cryptography-src)) diff --git a/lang/python/python-curl/Makefile b/lang/python/python-curl/Makefile index 9ca4845fa..8248c9bd7 100644 --- a/lang/python/python-curl/Makefile +++ b/lang/python/python-curl/Makefile @@ -17,7 +17,6 @@ PKG_LICENSE_FILES:=COPYING-LGPL include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-curl/Default @@ -29,16 +28,6 @@ define Package/python-curl/Default DEPENDS:=+libcurl endef -define Package/python-curl -$(call Package/python-curl/Default) - DEPENDS+=+PACKAGE_python-curl:python - VARIANT:=python -endef - -define Package/python-curl/description -PycURL is a Python interface to libcurl, the multiprotocol file transfer library. -endef - define Package/python3-curl $(call Package/python-curl/Default) DEPENDS+=+PACKAGE_python3-curl:python3 @@ -46,38 +35,29 @@ $(call Package/python-curl/Default) endef define Package/python3-curl/description -$(call Package/python-curl/description) +PycURL is a Python interface to libcurl, the multiprotocol file transfer library. . (Variant for Python3) endef -PYTHON_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_ARGS:= ifdef CONFIG_LIBCURL_OPENSSL - PYTHON_PKG_SETUP_ARGS+=--with-openssl PYTHON3_PKG_SETUP_ARGS+=--with-openssl endif ifdef CONFIG_LIBCURL_GNUTLS - PYTHON_PKG_SETUP_ARGS+=--with-gnutls PYTHON3_PKG_SETUP_ARGS+=--with-gnutls endif ifdef CONFIG_LIBCURL_MBEDTLS - PYTHON_PKG_SETUP_ARGS+=--with-mbedtls PYTHON3_PKG_SETUP_ARGS+=--with-mbedtls endif ifdef CONFIG_LIBCURL_WOLFSSL - PYTHON_PKG_SETUP_ARGS+=--with-wolfssl PYTHON3_PKG_SETUP_ARGS+=--with-wolfssl endif -$(eval $(call PyPackage,python-curl)) -$(eval $(call BuildPackage,python-curl)) -$(eval $(call BuildPackage,python-curl-src)) - $(eval $(call Py3Package,python3-curl)) $(eval $(call BuildPackage,python3-curl)) $(eval $(call BuildPackage,python3-curl-src)) diff --git a/lang/python/python-dateutil/Makefile b/lang/python/python-dateutil/Makefile index 8b5601eaf..5427f1772 100644 --- a/lang/python/python-dateutil/Makefile +++ b/lang/python/python-dateutil/Makefile @@ -19,7 +19,6 @@ PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-dateutil/Default @@ -30,16 +29,6 @@ define Package/python-dateutil/Default URL:=https://dateutil.readthedocs.org/ endef -define Package/python-dateutil -$(call Package/python-dateutil/Default) - DEPENDS:=+PACKAGE_python-dateutil:python +PACKAGE_python-dateutil:python-six - VARIANT:=python -endef - -define Package/python-dateutil/description - Extensions to the standard Python datetime module -endef - define Package/python3-dateutil $(call Package/python-dateutil/Default) DEPENDS:=+PACKAGE_python3-dateutil:python3 +PACKAGE_python3-dateutil:python3-six @@ -47,14 +36,11 @@ $(call Package/python-dateutil/Default) endef define Package/python3-dateutil/description -$(call Package/python-dateutil/description) + Extensions to the standard Python datetime module . (Variant for Python3) endef -$(eval $(call PyPackage,python-dateutil)) -$(eval $(call BuildPackage,python-dateutil)) -$(eval $(call BuildPackage,python-dateutil-src)) $(eval $(call Py3Package,python3-dateutil)) $(eval $(call BuildPackage,python3-dateutil)) $(eval $(call BuildPackage,python3-dateutil-src)) diff --git a/lang/python/python-defusedxml/Makefile b/lang/python/python-defusedxml/Makefile index 2057e0fa2..a7476defa 100644 --- a/lang/python/python-defusedxml/Makefile +++ b/lang/python/python-defusedxml/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-defusedxml/Default @@ -29,15 +28,6 @@ define Package/python-defusedxml/Default URL:=https://github.com/tiran/defusedxml endef -define Package/python-defusedxml - $(call Package/python-defusedxml/Default) - DEPENDS:= \ - +PACKAGE_python-defusedxml:python-light \ - +PACKAGE_python-defusedxml:python-codecs \ - +PACKAGE_python-defusedxml:python-xml - VARIANT:=python -endef - define Package/python3-defusedxml $(call Package/python-defusedxml/Default) DEPENDS:= \ @@ -46,21 +36,13 @@ define Package/python3-defusedxml VARIANT:=python3 endef -define Package/python-defusedxml/description +define Package/python3-defusedxml/description The defusedxml package contains several Python-only workarounds and fixes for denial of service and other vulnerabilities in Python’s XML libraries. -endef - -define Package/python3-defusedxml/description -$(call Package/python-defusedxml/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-defusedxml)) -$(eval $(call BuildPackage,python-defusedxml)) -$(eval $(call BuildPackage,python-defusedxml-src)) - $(eval $(call Py3Package,python3-defusedxml)) $(eval $(call BuildPackage,python3-defusedxml)) $(eval $(call BuildPackage,python3-defusedxml-src)) diff --git a/lang/python/python-dns/Makefile b/lang/python/python-dns/Makefile index bb93b85e5..a7837131a 100644 --- a/lang/python/python-dns/Makefile +++ b/lang/python/python-dns/Makefile @@ -23,7 +23,6 @@ PKG_CPE_ID:=cpe:/a:debian:python-dns PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-dnspython-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) @@ -36,16 +35,6 @@ define Package/python-dns/Default URL:=http://www.dnspython.org/ endef -define Package/python-dns -$(call Package/python-dns/Default) - DEPENDS:=+PACKAGE_python-dns:python - VARIANT:=python -endef - -define Package/python-dns/description - dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. -endef - define Package/python3-dns $(call Package/python-dns/Default) DEPENDS:=+PACKAGE_python3-dns:python3 @@ -53,14 +42,11 @@ $(call Package/python-dns/Default) endef define Package/python3-dns/description -$(call Package/python-dns/description) + dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. . (Variant for Python3) endef -$(eval $(call PyPackage,python-dns)) -$(eval $(call BuildPackage,python-dns)) -$(eval $(call BuildPackage,python-dns-src)) $(eval $(call Py3Package,python3-dns)) $(eval $(call BuildPackage,python3-dns)) $(eval $(call BuildPackage,python3-dns-src)) diff --git a/lang/python/python-docutils/Makefile b/lang/python/python-docutils/Makefile index 060ef552c..4cc9c2534 100644 --- a/lang/python/python-docutils/Makefile +++ b/lang/python/python-docutils/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-docutils/Default @@ -23,37 +22,22 @@ define Package/python-docutils/Default URL:=http://docutils.sourceforge.net endef -define Package/python-docutils -$(call Package/python-docutils/Default) - DEPENDS:=+PACKAGE_python-docutils:python - VARIANT:=python -endef - define Package/python3-docutils $(call Package/python-docutils/Default) DEPENDS:=+PACKAGE_python3-docutils:python3 VARIANT:=python3 endef -define Package/python-docutils/description +define Package/python3-docutils/description Docutils is a modular system for processing documentation into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax. -endef - -define Package/python3-docutils/description -$(call Package/python-docutils/description) . (Variant for Python3) endef -PYTHON_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_ARGS:= -$(eval $(call PyPackage,python-docutils)) -$(eval $(call BuildPackage,python-docutils)) -$(eval $(call BuildPackage,python-docutils-src)) - $(eval $(call Py3Package,python3-docutils)) $(eval $(call BuildPackage,python3-docutils)) $(eval $(call BuildPackage,python3-docutils-src)) diff --git a/lang/python/python-dpkt/Makefile b/lang/python/python-dpkt/Makefile deleted file mode 100644 index 1ca490803..000000000 --- a/lang/python/python-dpkt/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2017 Andrew McConachie -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-dpkt -PKG_VERSION:=1.9.2 -PKG_RELEASE:=1 - -PYPI_NAME:=dpkt -PKG_HASH:=52a92ecd5ca04d5bd852bb11cb2eac4bbe38b42a7c472e0d950eeb9f82a81e54 - -PKG_MAINTAINER:=Andrew McConachie <andrew@depht.com> -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-dpkt - SECTION:=language-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=python-dpkt - URL:=https://dpkt.readthedocs.io/en/latest/ - DEPENDS:=+python -endef - -define Package/python-dpkt/description - dpkt is a python module for fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols - https://pypi.python.org/pypi/dpkt - https://github.com/kbandla/dpkt -endef - -define Build/Compile - $(call Build/Compile/PyMod,,\ - install --prefix=/usr --root="$(PKG_INSTALL_DIR)" \ - ) -endef - -$(eval $(call PyPackage,python-dpkt)) -$(eval $(call BuildPackage,python-dpkt)) diff --git a/lang/python/python-egenix-mx-base/Makefile b/lang/python/python-egenix-mx-base/Makefile deleted file mode 100644 index dfb669b38..000000000 --- a/lang/python/python-egenix-mx-base/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2015 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:=python-egenix-mx-base -PKG_VERSION:=3.2.9 -PKG_RELEASE:=4 - -PKG_SOURCE:=egenix-mx-base-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://downloads.egenix.com/python -PKG_HASH:=1c6b67688e7a231c6c1da09b7a6a2210745c3f2507bdda70e2639faedbf68977 -PKG_BUILD_DIR:=$(BUILD_DIR)/egenix-mx-base-$(PKG_VERSION) - -PKG_MAINTAINER:=Dmitry Trefilov <the-alien@live.ru> -PKG_LICENSE:=eGenix -PKG_LICENSE_FILES:=LICENSE COPYRIGHT - -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-egenix-mx-base - SECTION:=lang - CATEGORY:=Languages - TITLE:=Egenix mxBase - SUBMENU:=Python - URL:=https://www.egenix.com/products/python/mxBase/ - DEPENDS:=+python-light - VARIANT:=python -endef - -define Package/python-egenix-mx-base/description - The eGenix.com mx Base Distribution for Python is a collection - of professional quality software tools which enhance Python's - usability in many important areas such as fast text searching, - date/time processing and high speed data types. -endef - -PYTHON_PKG_SETUP_ARGS:= - -$(eval $(call PyPackage,python-egenix-mx-base)) -$(eval $(call BuildPackage,python-egenix-mx-base)) -$(eval $(call BuildPackage,python-egenix-mx-base-src)) diff --git a/lang/python/python-enum34/Makefile b/lang/python/python-enum34/Makefile deleted file mode 100644 index f988e2fc4..000000000 --- a/lang/python/python-enum34/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2015-2018 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:=python-enum34 -PKG_VERSION:=1.1.10 -PKG_RELEASE:=1 - -PYPI_NAME:=enum34 -PKG_HASH:=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248 - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=enum/LICENSE -PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> -PKG_CPE_ID:=cpe:/a:python:enum34 - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-enum34/Default - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Backported Python 3.4 enum - URL:=https://bitbucket.org/stoneleaf/enum34 -endef - -define Package/python-enum34 -$(call Package/python-enum34/Default) - DEPENDS:=+PACKAGE_python-enum34:python-light - VARIANT:=python -endef - -define Package/python-enum34/description -enum34 is the new Python stdlib enum module available in Python 3.4 -backported for previous versions of Python from 2.4 to 3.3. -endef - -define PyPackage/python-enum34/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/enum/test.py -endef - -$(eval $(call PyPackage,python-enum34)) -$(eval $(call BuildPackage,python-enum34)) -$(eval $(call BuildPackage,python-enum34-src)) diff --git a/lang/python/python-enum34/patches/001-omit-docs.patch b/lang/python/python-enum34/patches/001-omit-docs.patch deleted file mode 100644 index 85faa0e8c..000000000 --- a/lang/python/python-enum34/patches/001-omit-docs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -71,15 +71,6 @@ data = dict( - version='1.1.10',
- url='https://bitbucket.org/stoneleaf/enum34',
- packages=packages,
-- package_data={
-- 'enum' : [
-- 'LICENSE',
-- 'README',
-- 'doc/enum.rst',
-- 'doc/enum.pdf',
-- 'test.py',
-- ]
-- },
- license='BSD License',
- description='Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4',
- long_description=long_desc,
diff --git a/lang/python/python-et_xmlfile/Makefile b/lang/python/python-et_xmlfile/Makefile index 426337d6d..6266e6627 100644 --- a/lang/python/python-et_xmlfile/Makefile +++ b/lang/python/python-et_xmlfile/Makefile @@ -17,7 +17,6 @@ PKG_HASH:=614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-et_xmlfile/Default @@ -28,14 +27,6 @@ define Package/python-et_xmlfile/Default URL:=https://bitbucket.org/openpyxl/et_xmlfile endef -define Package/python-et_xmlfile -$(call Package/python-et_xmlfile/Default) - DEPENDS:= \ - +PACKAGE_python-et_xmlfile:python-light \ - +PACKAGE_python-et_xmlfile:python-lxml - VARIANT:=python -endef - define Package/python3-et_xmlfile $(call Package/python-et_xmlfile/Default) DEPENDS:= \ @@ -44,22 +35,14 @@ $(call Package/python-et_xmlfile/Default) VARIANT:=python3 endef -define Package/python-et_xmlfile/description +define Package/python3-et_xmlfile/description An implementation of lxml.xmlfile for the standard library. It is based upon the xmlfile module from lxml with the aim of allowing code to be developed that will work with both libraries. -endef - -define Package/python3-et_xmlfile/description -$(call Package/python-et_xmlfile/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-et_xmlfile)) -$(eval $(call BuildPackage,python-et_xmlfile)) -$(eval $(call BuildPackage,python-et_xmlfile-src)) - $(eval $(call Py3Package,python3-et_xmlfile)) $(eval $(call BuildPackage,python3-et_xmlfile)) $(eval $(call BuildPackage,python3-et_xmlfile-src)) diff --git a/lang/python/python-evdev/Makefile b/lang/python/python-evdev/Makefile index 2f7ad030d..037d26c92 100644 --- a/lang/python/python-evdev/Makefile +++ b/lang/python/python-evdev/Makefile @@ -20,7 +20,6 @@ PKG_HASH:=b1c649b4fed7252711011da235782b2c260b32e004058d62473471e5cd30634d include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-evdev/Default @@ -30,15 +29,6 @@ define Package/python-evdev/Default URL:=https://github.com/gvalkov/python-evdev endef -define Package/python-evdev -$(call Package/python-evdev/Default) - TITLE:=python-evdev - DEPENDS:= \ - +PACKAGE_python-evdev:python-light \ - +PACKAGE_python-evdev:python-ctypes - VARIANT:=python -endef - define Package/python3-evdev $(call Package/python-evdev/Default) TITLE:=python3-evdev @@ -48,13 +38,8 @@ $(call Package/python-evdev/Default) VARIANT:=python3 endef - -define Package/python-evdev/description - Bindings to the Linux input handling subsystem -endef - define Package/python3-evdev/description -$(call Package/python-evdev/description) + Bindings to the Linux input handling subsystem . (Variant for Python3) endef @@ -66,12 +51,6 @@ PYTHON3_PKG_SETUP_GLOBAL_ARGS:= \ --evdev-headers="$(LINUX_EVDEV_HEADERS)" \ build_ext -PYTHON_PKG_SETUP_GLOBAL_ARGS:=$(PYTHON3_PKG_SETUP_GLOBAL_ARGS) - -$(eval $(call PyPackage,python-evdev)) -$(eval $(call BuildPackage,python-evdev)) -$(eval $(call BuildPackage,python-evdev-src)) - $(eval $(call Py3Package,python3-evdev)) $(eval $(call BuildPackage,python3-evdev)) $(eval $(call BuildPackage,python3-evdev-src)) diff --git a/lang/python/python-futures/Makefile b/lang/python/python-futures/Makefile deleted file mode 100644 index ba56053aa..000000000 --- a/lang/python/python-futures/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=futures -PKG_VERSION:=3.2.0 -PKG_RELEASE:=1 - -PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265 - -PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com> -PKG_LICENSE:=MIT - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-futures - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=futures - URL:=https://github.com/agronholm/pythonfutures - DEPENDS:=+python - VARIANT:=python -endef - -define Package/python-futures/description - This is a backport of the concurrent.futures standard library module to Python 2. - It should not be installed on Python 3, although there should be no harm in doing so, - as the standard library takes precedence over third party libraries. -endef - -$(eval $(call PyPackage,python-futures)) -$(eval $(call BuildPackage,python-futures)) -$(eval $(call BuildPackage,python-futures-src)) diff --git a/lang/python/python-gmpy2/Makefile b/lang/python/python-gmpy2/Makefile index 81f602c7c..c12e341c7 100644 --- a/lang/python/python-gmpy2/Makefile +++ b/lang/python/python-gmpy2/Makefile @@ -21,10 +21,8 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -PYTHON_PKG_SETUP_ARGS:=--nompfr PYTHON3_PKG_SETUP_ARGS:=--nompfr define Package/python-gmpy2/Default @@ -36,19 +34,13 @@ define Package/python-gmpy2/Default DEPENDS:=+libgmp endef -define Package/python-gmpy2 -$(call Package/python-gmpy2/Default) - DEPENDS+=+PACKAGE_python-gmpy2:python-light - VARIANT:=python -endef - define Package/python3-gmpy2 $(call Package/python-gmpy2/Default) DEPENDS+=+PACKAGE_python3-gmpy2:python3-light VARIANT:=python3 endef -define Package/python-gmpy2/description +define Package/python3-gmpy2/description gmpy2 is a C-coded Python extension module that supports multiple-precision arithmetic. gmpy2 is the successor to the original gmpy module. The gmpy module only supported the GMP multiple-precision library. gmpy2 adds support for the @@ -56,18 +48,10 @@ MPFR (correctly rounded real floating-point arithmetic) and MPC (correctly rounded complex floating-point arithmetic) libraries. gmpy2 also updates the API and naming conventions to be more consistent and support the additional functionality. -endef - -define Package/python3-gmpy2/description -$(call Package/python-gmpy2/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-gmpy2)) -$(eval $(call BuildPackage,python-gmpy2)) -$(eval $(call BuildPackage,python-gmpy2-src)) - $(eval $(call Py3Package,python3-gmpy2)) $(eval $(call BuildPackage,python3-gmpy2)) $(eval $(call BuildPackage,python3-gmpy2-src)) diff --git a/lang/python/python-gnupg/Makefile b/lang/python/python-gnupg/Makefile index 54a827e95..53f716547 100644 --- a/lang/python/python-gnupg/Makefile +++ b/lang/python/python-gnupg/Makefile @@ -18,7 +18,6 @@ PKG_CPE_ID:=cpe:/a:python-gnupg_project:python-gnupg include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-gnupg/Default @@ -29,13 +28,6 @@ define Package/python-gnupg/Default DEPENDS:=+gnupg endef -define Package/python-gnupg -$(call Package/python-gnupg/Default) - TITLE:=python-pyodbc - DEPENDS+=+PACKAGE_python-gnupg:python-light - VARIANT:=python -endef - define Package/python3-gnupg $(call Package/python-gnupg/Default) TITLE:=python3-gnupg @@ -43,7 +35,7 @@ $(call Package/python-gnupg/Default) VARIANT:=python3 endef -define Package/python-gnupg/description +define Package/python3-gnupg/description A Python wrapper for GnuPG This module allows easy access to GnuPG.s key management, encryption @@ -53,29 +45,15 @@ and sanitised, and therefore this module should be safe to use in networked applications requiring direct user input. It is intended for use on Windows, MacOS X, BSD, or Linux, with Python 2.6, Python 2.7, Python 3.3, Python 3.4, or PyPy. -endef - -define Package/python3-gnupg/description -$(call Package/python-gnupg/description) (Variant for Python3) endef -define PyBuild/Compile - $(call Build/Compile/PyMod,,\ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ - ) -endef - define Py3Build/Compile $(call Build/Compile/Py3Mod,,\ install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ ) endef - -$(eval $(call PyPackage,python-gnupg)) -$(eval $(call BuildPackage,python-gnupg)) - $(eval $(call Py3Package,python3-gnupg)) $(eval $(call BuildPackage,python3-gnupg)) diff --git a/lang/python/python-hyperlink/Makefile b/lang/python/python-hyperlink/Makefile index 869fc5a9b..8a88eb60d 100644 --- a/lang/python/python-hyperlink/Makefile +++ b/lang/python/python-hyperlink/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-hyperlink/Default @@ -31,14 +30,6 @@ define Package/python-hyperlink/Default URL:=https://github.com/python-hyper/hyperlink endef -define Package/python-hyperlink -$(call Package/python-hyperlink/Default) - DEPENDS:= \ - +PACKAGE_python-hyperlink:python-light \ - +PACKAGE_python-hyperlink:python-idna - VARIANT:=python -endef - define Package/python3-hyperlink $(call Package/python-hyperlink/Default) DEPENDS:= \ @@ -47,22 +38,14 @@ $(call Package/python-hyperlink/Default) VARIANT:=python3 endef -define Package/python-hyperlink/description +define Package/python3-hyperlink/description Hyperlink provides a pure-Python implementation of immutable URLs. Based on RFC 3986 and 3987, the Hyperlink URL makes working with both URIs and IRIs easy. -endef - -define Package/python3-hyperlink/description -$(call Package/python-hyperlink/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-hyperlink)) -$(eval $(call BuildPackage,python-hyperlink)) -$(eval $(call BuildPackage,python-hyperlink-src)) - $(eval $(call Py3Package,python3-hyperlink)) $(eval $(call BuildPackage,python3-hyperlink)) $(eval $(call BuildPackage,python3-hyperlink-src)) diff --git a/lang/python/python-idna/Makefile b/lang/python/python-idna/Makefile index 57b6d7abe..fe524b44b 100644 --- a/lang/python/python-idna/Makefile +++ b/lang/python/python-idna/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleana include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-idna/Default @@ -31,14 +30,6 @@ define Package/python-idna/Default URL:=https://github.com/kjd/idna endef -define Package/python-idna -$(call Package/python-idna/Default) - DEPENDS:= \ - +PACKAGE_python-idna:python-light \ - +PACKAGE_python-idna:python-codecs - VARIANT:=python -endef - define Package/python3-idna $(call Package/python-idna/Default) DEPENDS:= \ @@ -47,23 +38,15 @@ $(call Package/python-idna/Default) VARIANT:=python3 endef -define Package/python-idna/description +define Package/python3-idna/description A library to support the Internationalised Domain Names in Applications (IDNA) protocol as specified in RFC 5891. This version of the protocol is often referred to as "IDNA2008" and can produce different results from the earlier standard from 2003. -endef - -define Package/python3-idna/description -$(call Package/python-idna/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-idna)) -$(eval $(call BuildPackage,python-idna)) -$(eval $(call BuildPackage,python-idna-src)) - $(eval $(call Py3Package,python3-idna)) $(eval $(call BuildPackage,python3-idna)) $(eval $(call BuildPackage,python3-idna-src)) diff --git a/lang/python/python-incremental/Makefile b/lang/python/python-incremental/Makefile index 65cc4f712..7390088f0 100644 --- a/lang/python/python-incremental/Makefile +++ b/lang/python/python-incremental/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-incremental/Default @@ -31,32 +30,18 @@ define Package/python-incremental/Default URL:=https://github.com/twisted/incremental endef -define Package/python-incremental -$(call Package/python-incremental/Default) - DEPENDS:=+PACKAGE_python-incremental:python-light - VARIANT:=python -endef - define Package/python3-incremental $(call Package/python-incremental/Default) DEPENDS:=+PACKAGE_python3-incremental:python3-light VARIANT:=python3 endef -define Package/python-incremental/description -Incremental is a small library that versions your Python projects. -endef - define Package/python3-incremental/description -$(call Package/python-incremental/description) +Incremental is a small library that versions your Python projects. . (Variant for Python3) endef -$(eval $(call PyPackage,python-incremental)) -$(eval $(call BuildPackage,python-incremental)) -$(eval $(call BuildPackage,python-incremental-src)) - $(eval $(call Py3Package,python3-incremental)) $(eval $(call BuildPackage,python3-incremental)) $(eval $(call BuildPackage,python3-incremental-src)) diff --git a/lang/python/python-ipaddress/Makefile b/lang/python/python-ipaddress/Makefile deleted file mode 100644 index 664076bed..000000000 --- a/lang/python/python-ipaddress/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2015-2018 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:=python-ipaddress -PKG_VERSION:=1.0.23 -PKG_RELEASE:=1 - -PYPI_NAME:=ipaddress -PKG_HASH:=b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2 - -PKG_LICENSE:=Python-2.0 -PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-ipaddress/Default - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Python 3.3+'s ipaddress - URL:=https://github.com/phihag/ipaddress -endef - -define Package/python-ipaddress -$(call Package/python-ipaddress/Default) - DEPENDS:=+PACKAGE_python-ipaddress:python-light - VARIANT:=python -endef - -define Package/python-ipaddress/description -Python 3.3+'s ipaddress for Python 2.6, 2.7, 3.2. -endef - -$(eval $(call PyPackage,python-ipaddress)) -$(eval $(call BuildPackage,python-ipaddress)) -$(eval $(call BuildPackage,python-ipaddress-src)) diff --git a/lang/python/python-jdcal/Makefile b/lang/python/python-jdcal/Makefile index b674c8227..035fa623f 100644 --- a/lang/python/python-jdcal/Makefile +++ b/lang/python/python-jdcal/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-jdcal/Default @@ -29,32 +28,18 @@ define Package/python-jdcal/Default URL:=https://github.com/phn/jdcal endef -define Package/python-jdcal -$(call Package/python-jdcal/Default) - DEPENDS:= +PACKAGE_python-jdcal:python-light - VARIANT:=python -endef - define Package/python3-jdcal $(call Package/python-jdcal/Default) DEPENDS:= +PACKAGE_python3-jdcal:python3-light VARIANT:=python3 endef -define Package/python-jdcal/description - This module contains functions for converting between Julian dates and calendar dates. -endef - define Package/python3-jdcal/description -$(call Package/python-jdcal/description) + This module contains functions for converting between Julian dates and calendar dates. . (Variant for Python3) endef -$(eval $(call PyPackage,python-jdcal)) -$(eval $(call BuildPackage,python-jdcal)) -$(eval $(call BuildPackage,python-jdcal-src)) - $(eval $(call Py3Package,python3-jdcal)) $(eval $(call BuildPackage,python3-jdcal)) $(eval $(call BuildPackage,python3-jdcal-src)) diff --git a/lang/python/python-jmespath/Makefile b/lang/python/python-jmespath/Makefile index e4d1494fb..3006caf9a 100644 --- a/lang/python/python-jmespath/Makefile +++ b/lang/python/python-jmespath/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-jmespath/Default @@ -23,33 +22,19 @@ define Package/python-jmespath/Default URL:=https://github.com/jmespath/jmespath.py endef -define Package/python-jmespath -$(call Package/python-jmespath/Default) - DEPENDS:=+PACKAGE_python-jmespath:python - VARIANT:=python -endef - define Package/python3-jmespath $(call Package/python-jmespath/Default) DEPENDS:=+PACKAGE_python3-jmespath:python3 VARIANT:=python3 endef -define Package/python-jmespath/description +define Package/python3-jmespath/description JMESPath (pronounced “james path”) allows you to declaratively specify how to extract elements from a JSON document. -endef - -define Package/python3-jmespath/description -$(call Package/python-jmespath/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-jmespath)) -$(eval $(call BuildPackage,python-jmespath)) -$(eval $(call BuildPackage,python-jmespath-src)) - $(eval $(call Py3Package,python3-jmespath)) $(eval $(call BuildPackage,python3-jmespath)) $(eval $(call BuildPackage,python3-jmespath-src)) diff --git a/lang/python/python-ldap/Makefile b/lang/python/python-ldap/Makefile deleted file mode 100644 index 780802858..000000000 --- a/lang/python/python-ldap/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2016-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:=python-ldap -PKG_VERSION:=3.1.0 -PKG_RELEASE:=1 -PKG_MAINTAINER:=Dmitry Trefilov <the-alien@live.ru> -PKG_LICENSE:=Python-style -PKG_LICENSE_FILES:=LICENSE - -PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5 - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-ldap - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - DEPENDS:=+libopenldap +python - TITLE:=Python modules for implementing LDAP clients - URL:=https://python-ldap.org/ -endef - -define Package/python-ldap/description - python-ldap provides an object-oriented API to access LDAP directory - servers from Python programs. Mainly it wraps the OpenLDAP 2.x libs - for that purpose. Additionally the package contains modules for - other LDAP-related stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 - schema, LDAPv3 extended operations and controls, etc.). -endef - -define Build/Compile - $(call Build/Compile/PyMod,,build_ext \ - --include-dirs="$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/include/sasl" \ - --library-dirs="$(STAGING_DIR)/usr/lib:$(STAGING_DIR)/usr/lib/sasl2" \ - build_py \ - install --prefix="$(PKG_INSTALL_DIR)/usr") -endef - -define PyPackage/python-ldap/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call PyPackage,python-ldap)) -$(eval $(call BuildPackage,python-ldap)) diff --git a/lang/python/python-libmodbus/Makefile b/lang/python/python-libmodbus/Makefile index 2f393f447..fda6db33d 100644 --- a/lang/python/python-libmodbus/Makefile +++ b/lang/python/python-libmodbus/Makefile @@ -13,7 +13,6 @@ PKG_HASH:=80f837304ffa8476145ea643f6b98aa94b205013a96f1e5173d7bdc776426aee include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-libmodbus/Default @@ -23,15 +22,6 @@ define Package/python-libmodbus/Default URL:=https://pypi.org/project/pylibmodbus endef -define Package/python-libmodbus -$(call Package/python-libmodbus/Default) - TITLE:=python-libmodbus - DEPENDS:=+libmodbus \ - +PACKAGE_python-libmodbus:python-light \ - +PACKAGE_python-libmodbus:python-cffi - VARIANT:=python -endef - define Package/python3-libmodbus $(call Package/python-libmodbus/Default) TITLE:=pylibmodbus @@ -41,18 +31,11 @@ $(call Package/python-libmodbus/Default) VARIANT:=python3 endef -define Package/python-libmodbus/description - Python Interface for libmodbus written with CFFI. -endef - define Package/python3-libmodbus/description -$(call Package/python-libmodbus/description) + Python Interface for libmodbus written with CFFI. . (Variant for Python3) endef -$(eval $(call PyPackage,python-libmodbus)) -$(eval $(call BuildPackage,python-libmodbus)) - $(eval $(call Py3Package,python3-libmodbus)) $(eval $(call BuildPackage,python3-libmodbus)) diff --git a/lang/python/python-lxml/Makefile b/lang/python/python-lxml/Makefile index 611168de7..c2c7d3ad3 100644 --- a/lang/python/python-lxml/Makefile +++ b/lang/python/python-lxml/Makefile @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:lxml:lxml include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-lxml/Default @@ -32,13 +31,6 @@ define Package/python-lxml/Default DEPENDS:=+libxml2 +libxslt +libexslt endef -define Package/python-lxml -$(call Package/python-lxml/Default) - TITLE:=python-lxml - DEPENDS+=+PACKAGE_python-lxml:python-light +PACKAGE_python-lxml:python-codecs - VARIANT:=python -endef - define Package/python3-lxml $(call Package/python-lxml/Default) TITLE:=python3-lxml @@ -46,32 +38,15 @@ $(call Package/python-lxml/Default) VARIANT:=python3 endef -define Package/python-lxml/description +define Package/python3-lxml/description The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. -endef - -define Package/python3-lxml/description -$(call Package/python-lxml/description) . (Variant for Python3) endef TARGET_LDFLAGS += -lxml2 -lxslt -lexslt -define PyBuild/Compile - $(call Build/Compile/PyMod,, \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ - --static \ - --single-version-externally-managed \ - , \ - INCLUDE="$(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/include/libxml2" \ - LIBRARY="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ) -endef - define Py3Build/Compile $(call Build/Compile/Py3Mod,, \ install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ @@ -85,10 +60,6 @@ define Py3Build/Compile ) endef -$(eval $(call PyPackage,python-lxml)) -$(eval $(call BuildPackage,python-lxml)) -$(eval $(call BuildPackage,python-lxml-src)) - $(eval $(call Py3Package,python3-lxml)) $(eval $(call BuildPackage,python3-lxml)) $(eval $(call BuildPackage,python3-lxml-src)) diff --git a/lang/python/python-mysqlclient/Makefile b/lang/python/python-mysqlclient/Makefile index 47f4a1a5d..9f24e3b83 100644 --- a/lang/python/python-mysqlclient/Makefile +++ b/lang/python/python-mysqlclient/Makefile @@ -18,7 +18,6 @@ PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk # python-mysqlclient needs iconv include $(INCLUDE_DIR)/nls.mk @@ -30,13 +29,6 @@ define Package/python-mysqlclient/Default URL:=https://mysqlclient.readthedocs.io/ endef -define Package/python-mysqlclient - $(call Package/python-mysqlclient/Default) - TITLE:=MySQL database adapter for Python - DEPENDS:=+PACKAGE_python-mysqlclient:python +libmysqlclient - VARIANT:=python -endef - define Package/python3-mysqlclient $(call Package/python-mysqlclient/Default) TITLE:=MySQL database adapter for Python3 @@ -44,21 +36,13 @@ define Package/python3-mysqlclient VARIANT:=python3 endef -define Package/python-mysqlclient/description +define Package/python3-mysqlclient/description MySQLdb is an thread-compatible interface to the popular MySQL database server that provides the Python database API. -endef - -define Package/python3-mysqlclient/description -$(call Package/python-mysqlclient/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-mysqlclient)) -$(eval $(call BuildPackage,python-mysqlclient)) -$(eval $(call BuildPackage,python-mysqlclient-src)) - $(eval $(call Py3Package,python3-mysqlclient)) $(eval $(call BuildPackage,python3-mysqlclient)) $(eval $(call BuildPackage,python3-mysqlclient-src)) diff --git a/lang/python/python-oauthlib/Makefile b/lang/python/python-oauthlib/Makefile index ae157406f..4fcd4cea9 100644 --- a/lang/python/python-oauthlib/Makefile +++ b/lang/python/python-oauthlib/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-oauthlib/Default @@ -29,33 +28,19 @@ define Package/python-oauthlib/Default URL:=https://github.com/oauthlib/oauthlib endef -define Package/python-oauthlib - $(call Package/python-oauthlib/Default) - DEPENDS:=+PACKAGE_python-oauthlib:python-light - VARIANT:=python -endef - define Package/python3-oauthlib $(call Package/python-oauthlib/Default) DEPENDS:=+PACKAGE_python3-oauthlib:python3-light VARIANT:=python3 endef -define Package/python-oauthlib/description +define Package/python3-oauthlib/description A generic, spec-compliant, thorough implementation of the OAuth request-signing logic for Python -endef - -define Package/python3-oauthlib/description -$(call Package/python-oauthlib/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-oauthlib)) -$(eval $(call BuildPackage,python-oauthlib)) -$(eval $(call BuildPackage,python-oauthlib-src)) - $(eval $(call Py3Package,python3-oauthlib)) $(eval $(call BuildPackage,python3-oauthlib)) $(eval $(call BuildPackage,python3-oauthlib-src)) diff --git a/lang/python/python-packages/Makefile b/lang/python/python-packages/Makefile deleted file mode 100644 index 1cc565f01..000000000 --- a/lang/python/python-packages/Makefile +++ /dev/null @@ -1,131 +0,0 @@ -# -# Copyright (C) 2016 Yousong Zhou <yszhou4tech@gmail.com> -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-packages -PKG_VERSION:=1.0 -PKG_RELEASE:=2 - -PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> - -# -# NOTE: move the host module installation to Host/Compile when -# HOST_CONFIG_DEPENDS is supported -# -# NOTE: PKG_CONFIG_DEPENDS cannot correctly track changes of string type config -# options, so you may want to do manual cleanup on config change. -# -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_python-packages-list-host \ - CONFIG_PACKAGE_python-packages-list \ - CONFIG_PACKAGE_python-packages-list-cleanup \ - CONFIG_PACKAGE_python-packages-envs \ - CONFIG_PACKAGE_python-packages-extra-deps \ - CONFIG_PACKAGE_python-packages-index-url \ - CONFIG_PACKAGE_python-packages-pip-opts \ - -PKG_BUILD_DEPENDS:=python python/host - -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-packages - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=A dummy package for packaging python modules with pip - DEPENDS:=@DEVEL +python -endef - -define Package/python-packages/config -if PACKAGE_python-packages -config PACKAGE_python-packages-list-host - string "List of python packages to install on host" -config PACKAGE_python-packages-list - string "List of python packages to install on target" -config PACKAGE_python-packages-list-cleanup - string "List of python packages to cleanup to avoid clash with existing packages" -config PACKAGE_python-packages-envs - string "Extra environment variables to pass on to pip and its children on target build" -config PACKAGE_python-packages-extra-deps - string "List of deps fulfilled but not tracked by the build system" -config PACKAGE_python-packages-index-url - string "Index URL passed to pip with --index-url" -config PACKAGE_python-packages-pip-opts - string "Additional arguments to pip command line" -endif -endef - -CONFIG_PACKAGE_python-packages-list-host:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list-host)) -CONFIG_PACKAGE_python-packages-list:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list)) -CONFIG_PACKAGE_python-packages-list-cleanup:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-list-cleanup)) -CONFIG_PACKAGE_python-packages-envs:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-envs)) -CONFIG_PACKAGE_python-packages-extra-deps:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-extra-deps)) -CONFIG_PACKAGE_python-packages-index-url:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-index-url)) -CONFIG_PACKAGE_python-packages-pip-opts:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-pip-opts)) - -HOST_PYTHON_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON_VERSION) - -decr=$(word $(1),0 1 2 3 4 5 6 7 8 9 10) -recur=$(if $(subst 0,,$(2)),$(call recur,$(1),$(call decr,$(2)),$(call $(1)$(2),$(3))),$(3)) -_req2dir1=$(subst >,gt,$(1)) -_req2dir2=$(subst <,lt,$(1)) -_req2dir3=$(subst >=,geq,$(1)) -_req2dir4=$(subst <=,leq,$(1)) -_req2dir5=$(subst ://,:::,$(1)) -_req2dir6=$(subst *,_,$(1)) -_req2dir7=$(subst ?,_,$(1)) -req2dir=$(call recur,_req2dir,7,$(1)) - -# --ignore-installed, it may happen that host pip will ignore target install if -# it was already installed as host module, e.g. cffi deps of cryptograph -HOST_PYTHON_PIP_INSTALL=$(HOST_PYTHON_PIP) install \ - --root=$(1) \ - --prefix=$(2) \ - --ignore-installed \ - --no-compile \ - $(if $(CONFIG_PACKAGE_python-packages-index-url), --index-url "$(CONFIG_PACKAGE_python-packages-index-url)") \ - $(if $(CONFIG_PACKAGE_python-packages-pip-opts), $(CONFIG_PACKAGE_python-packages-pip-opts)) \ - -HOST_PYTHON_PIP_INSTALL_HOST:=$(call HOST_PYTHON_PIP_INSTALL,$(STAGING_DIR_HOSTPKG),"") -HOST_PYTHON_PIP_INSTALL_TARGET=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/$(call req2dir,$(pkg)),/usr) -HOST_PYTHON_PIP_INSTALL_CLEANUP:=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/_cleanup,/usr) - -define Build/Compile - $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list-host), - $(call Build/Compile/HostPyRunHost,,$(HOST_PYTHON_PIP_INSTALL_HOST) $(pkg)) - ) - $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list), - $(call Build/Compile/HostPyRunTarget,,$(call HOST_PYTHON_PIP_INSTALL_TARGET,$(pkg)) $(pkg),$(CONFIG_PACKAGE_python-packages-envs)) - ) - $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list-cleanup), - $(call Build/Compile/HostPyRunTarget,,$(HOST_PYTHON_PIP_INSTALL_CLEANUP) $(pkg),$(CONFIG_PACKAGE_python-packages-envs)) - ) -endef - -define Package/python-packages/install - $(foreach pkg,$(CONFIG_PACKAGE_python-packages-list), - $(CP) "$(PKG_INSTALL_DIR)/$(call req2dir,$(pkg))"/* $(1) - ) - - find "$(PKG_INSTALL_DIR)/_cleanup" -mindepth 1 -depth | while read sf; do \ - tf="$$$${sf#$(PKG_INSTALL_DIR)/_cleanup/}"; \ - tf="$(1)/$$$$tf"; \ - if [ -f "$$$$tf" -o -L "$$$$tf" ]; then \ - rm -vf "$$$$tf"; \ - elif [ -d "$$$$tf" ]; then \ - rmdir -v -p "$$$$tf" || true; \ - fi \ - done -endef - -define Package/python-packages/extra_provides - echo $(CONFIG_PACKAGE_python-packages-extra-deps) | tr ' ' '\n' -endef - -$(eval $(call BuildPackage,python-packages)) diff --git a/lang/python/python-packages/README.md b/lang/python/python-packages/README.md deleted file mode 100644 index 3c09d8eb6..000000000 --- a/lang/python/python-packages/README.md +++ /dev/null @@ -1,72 +0,0 @@ -This package allows users to package python modules without creating package -Makefiles for each individual module and their dependencies. It provides a -way making packaging python packages faster and may also facilitate the process -of developing Makefiles for new python packages - -This is a raw DEVEL only package. Using it may entail a lot of implementation -details and you may need to resolve target dependencies and package details on -your own - -- Third party python packages may depend on features not included in e.g. - python-light -- Some python modules may require host install of another module to progress, - e.g. target cryptography requires host cffi -- Some python modules have external C library dependencies, e.g. pyOpenSSL - requires openssl libs -- Some packages may have an autoconf configure script whose arguments we - cannot control with pip and has to be passed on (hacked) by overriding some - environment variables - -## How it works - -1. Install host modules required for building target modules -2. Install each target module to separate directories -3. Install another copy of modules for cleanup purposes to make list of - installed files to be removed from target modules installed in step 2 - -Why should it be so - -1. Installing target cryptography requires host installation of cffi module -2. cryptography requires setuptools and pip will install its own copy with - --ignore-installed. When PACKAGE_python-setuptools is also selected, opkg - will complain of data file clashes if it was not removed here. - -Pip will handle dependency requirements of python modules, but external -dependencies like c libraries has to be prepared by the build system. The -issue is that there is currently no way to express such dependencies, thus may -cause build failure, e.g. pycrypto requires the presence of libgmp to build -successfully. - -## Tips - -If something goes wrong, we can add additional arguments to pip command -line to check the detailed build process. Some useful arguments may be - -- -v, for verbose output. Repeat this option if the current level of - verbosity is not enough -- --no-clean, for preserving pip build dir on build failure - -## Examples - -tornado (python-only module) - - CONFIG_PACKAGE_python-packages=y - CONFIG_PACKAGE_python-packages-list="tornado==4.4.2" - -cryptography (requires installation of host modules and cleanup on target modules) - - CONFIG_PACKAGE_python-packages=y - CONFIG_PACKAGE_python-packages-list-host="cffi" - CONFIG_PACKAGE_python-packages-list="cryptography" - CONFIG_PACKAGE_python-packages-list-cleanup="setuptools" - -pycrypto 2.7a1 (python module with autoconf configure script; depends on -libgmp; broken wmmintrin.h). 2.6.1 does not work because of a flaw in -the setup.py hardcoding host include directory - - CONFIG_PACKAGE_libgmp=y - CONFIG_PACKAGE_python-packages=y - CONFIG_PACKAGE_python-packages-list="https://github.com/dlitz/pycrypto/archive/v2.7a1.tar.gz" - CONFIG_PACKAGE_python-packages-envs="ac_cv_header_wmmintrin_h=no build_alias=$(GNU_HOST_NAME) host_alias=$(GNU_TARGET_NAME) target_alias=$(GNU_TARGET_NAME)" - CONFIG_PACKAGE_python-packages-extra-deps="libgmp.so.10" - diff --git a/lang/python/python-parsley/Makefile b/lang/python/python-parsley/Makefile index 39fed358c..ad28e585e 100644 --- a/lang/python/python-parsley/Makefile +++ b/lang/python/python-parsley/Makefile @@ -20,10 +20,8 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk -PYTHON_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_ARGS:= define Package/python-parsley/Default @@ -34,32 +32,18 @@ define Package/python-parsley/Default URL:=http://launchpad.net/parsley endef -define Package/python-parsley -$(call Package/python-parsley/Default) - DEPENDS:=+PACKAGE_python-parsley:python-light - VARIANT:=python -endef - define Package/python3-parsley $(call Package/python-parsley/Default) DEPENDS:=+PACKAGE_python3-parsley:python3-light VARIANT:=python3 endef -define Package/python-parsley/description -Parsing and pattern matching made easy. -endef - define Package/python3-parsley/description -$(call Package/python-parsley/description) +Parsing and pattern matching made easy. . (Variant for Python3) endef -$(eval $(call PyPackage,python-parsley)) -$(eval $(call BuildPackage,python-parsley)) -$(eval $(call BuildPackage,python-parsley-src)) - $(eval $(call Py3Package,python3-parsley)) $(eval $(call BuildPackage,python3-parsley)) $(eval $(call BuildPackage,python3-parsley-src)) diff --git a/lang/python/python-pcapy/Makefile b/lang/python/python-pcapy/Makefile deleted file mode 100644 index 5389146e6..000000000 --- a/lang/python/python-pcapy/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2016 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:=python-pcapy -PKG_VERSION:=0.11.4 -PKG_RELEASE:=2 - -PYPI_NAME:=pcapy -PKG_HASH:=aa239913678d7ba116e66057a37f914de7726aecd11d00db470127df115c4e78 - -PKG_MAINTAINER:=Andrew McConachie <andrew@depht.com> -PKG_LICENSE:=Apache-1.1 - -include ../pypi.mk -include $(INCLUDE_DIR)/uclibc++.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-pcapy - SECTION:=language-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=python-pcapy - URL:=https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy - DEPENDS:=+python +libpcap $(CXX_DEPENDS) -endef - -define Package/python-pcapy/description - Pcapy is a Python extension module that interfaces with the libpcap packet capture library. Pcapy enables python scripts to capture packets on the network. Pcapy is highly effective when used in conjunction with a packet-handling package such as Impacket, which is a collection of Python classes for constructing and dissecting network packets. -endef - -define Build/Compile - $(call Build/Compile/PyMod,,\ - install --prefix=/usr --root="$(PKG_INSTALL_DIR)" \ - ) -endef - -$(eval $(call PyPackage,python-pcapy)) -$(eval $(call BuildPackage,python-pcapy)) diff --git a/lang/python/python-pcapy/patches/010-libcxx.patch b/lang/python/python-pcapy/patches/010-libcxx.patch deleted file mode 100644 index d27dbdd0a..000000000 --- a/lang/python/python-pcapy/patches/010-libcxx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 4da69bc..165059b 100644 ---- a/setup.py -+++ b/setup.py -@@ -28,7 +28,7 @@ if sys.platform == 'win32': - library_dirs.append(r'c:\wpdpack\Lib') - libraries = ['wpcap', 'packet', 'ws2_32'] - else: -- libraries = ['pcap', 'stdc++'] -+ libraries = ['pcap'] - - - # end of user configurable parameters diff --git a/lang/python/python-ply/Makefile b/lang/python/python-ply/Makefile index ea6457d77..4b302d048 100644 --- a/lang/python/python-ply/Makefile +++ b/lang/python/python-ply/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-ply/Default @@ -31,33 +30,19 @@ define Package/python-ply/Default URL:=http://www.dabeaz.com/ply/ endef -define Package/python-ply -$(call Package/python-ply/Default) - DEPENDS:=+PACKAGE_python-ply:python-light - VARIANT:=python -endef - define Package/python3-ply $(call Package/python-ply/Default) DEPENDS:=+PACKAGE_python3-ply:python3-light VARIANT:=python3 endef -define Package/python-ply/description +define Package/python3-ply/description PLY is a 100% Python implementation of the common parsing tools lex and yacc. -endef - -define Package/python3-ply/description -$(call Package/python-ply/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-ply)) -$(eval $(call BuildPackage,python-ply)) -$(eval $(call BuildPackage,python-ply-src)) - $(eval $(call Py3Package,python3-ply)) $(eval $(call BuildPackage,python3-ply)) $(eval $(call BuildPackage,python3-ply-src)) diff --git a/lang/python/python-psycopg2/Makefile b/lang/python/python-psycopg2/Makefile deleted file mode 100644 index b67d29efd..000000000 --- a/lang/python/python-psycopg2/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2016 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:=python-psycopg2 -PKG_VERSION:=2.7.6.1 -PKG_RELEASE:=2 - -PYPI_NAME:=psycopg2 -PKG_HASH:=27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82 - -PKG_MAINTAINER:=Dmitry Trefilov <the-alien@live.ru> -PKG_LICENSE:=LGPL-3.0-or-later -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=python/host - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-psycopg2 - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=PostgreSQL database adapter for Python - URL:=http://initd.org/psycopg/ - DEPENDS:=+python +libpq +python-egenix-mx-base -endef - -define Package/python-psycopg2/description - Psycopg is the most popular PostgreSQL adapter for the Python programming language -endef - -define Build/Compile - # The PATH var is required so that psycopg2's setup.py script finds pg_config - $(call Build/Compile/PyMod,., \ - install --prefix=/usr --root=$(PKG_INSTALL_DIR), \ - PATH=$(STAGING_DIR)/usr/bin:$(PATH)) -endef - -define Package/python-psycopg2/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call PyPackage,python-psycopg2)) -$(eval $(call BuildPackage,python-psycopg2)) diff --git a/lang/python/python-pyasn1-modules/Makefile b/lang/python/python-pyasn1-modules/Makefile index 5261bece5..5eafbfef4 100644 --- a/lang/python/python-pyasn1-modules/Makefile +++ b/lang/python/python-pyasn1-modules/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleana include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyasn1-modules/Default @@ -31,14 +30,6 @@ define Package/python-pyasn1-modules/Default URL:=https://github.com/etingof/pyasn1-modules endef -define Package/python-pyasn1-modules -$(call Package/python-pyasn1-modules/Default) - DEPENDS:= \ - +PACKAGE_python-pyasn1-modules:python-light \ - +PACKAGE_python-pyasn1-modules:python-pyasn1 - VARIANT:=python -endef - define Package/python3-pyasn1-modules $(call Package/python-pyasn1-modules/Default) DEPENDS:= \ @@ -47,21 +38,13 @@ $(call Package/python-pyasn1-modules/Default) VARIANT:=python3 endef -define Package/python-pyasn1-modules/description +define Package/python3-pyasn1-modules/description This is a small but growing collection of ASN.1 data structures expressed in Python terms using pyasn1 data model. -endef - -define Package/python3-pyasn1-modules/description -$(call Package/python-pyasn1-modules/description) . (Variant for Python3). endef -$(eval $(call PyPackage,python-pyasn1-modules)) -$(eval $(call BuildPackage,python-pyasn1-modules)) -$(eval $(call BuildPackage,python-pyasn1-modules-src)) - $(eval $(call Py3Package,python3-pyasn1-modules)) $(eval $(call BuildPackage,python3-pyasn1-modules)) $(eval $(call BuildPackage,python3-pyasn1-modules-src)) diff --git a/lang/python/python-pyasn1/Makefile b/lang/python/python-pyasn1/Makefile index 3ba9073cd..23c81a613 100644 --- a/lang/python/python-pyasn1/Makefile +++ b/lang/python/python-pyasn1/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleana include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyasn1/Default @@ -31,35 +30,21 @@ define Package/python-pyasn1/Default URL:=https://github.com/etingof/pyasn1 endef -define Package/python-pyasn1 -$(call Package/python-pyasn1/Default) - DEPENDS:=+PACKAGE_python-pyasn1:python-light - VARIANT:=python -endef - define Package/python3-pyasn1 $(call Package/python-pyasn1/Default) DEPENDS:=+PACKAGE_python3-pyasn1:python3-light VARIANT:=python3 endef -define Package/python-pyasn1/description +define Package/python3-pyasn1/description This is an implementation of ASN.1 types and codecs in Python programming language. It has been first written to support particular protocol (SNMP) but then generalized to be suitable for a wide range of protocols based on ASN.1 specification. -endef - -define Package/python3-pyasn1/description -$(call Package/python-pyasn1/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-pyasn1)) -$(eval $(call BuildPackage,python-pyasn1)) -$(eval $(call BuildPackage,python-pyasn1-src)) - $(eval $(call Py3Package,python3-pyasn1)) $(eval $(call BuildPackage,python3-pyasn1)) $(eval $(call BuildPackage,python3-pyasn1-src)) diff --git a/lang/python/python-pycparser/Makefile b/lang/python/python-pycparser/Makefile index 19cf88c1d..1c1b9199e 100644 --- a/lang/python/python-pycparser/Makefile +++ b/lang/python/python-pycparser/Makefile @@ -18,12 +18,10 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> -HOST_PYTHON_PACKAGE_BUILD_DEPENDS:="ply==3.10" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="ply==3.10" include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pycparser/Default @@ -34,14 +32,6 @@ define Package/python-pycparser/Default URL:=https://github.com/eliben/pycparser endef -define Package/python-pycparser -$(call Package/python-pycparser/Default) - DEPENDS:= \ - +PACKAGE_python-pycparser:python-light \ - +PACKAGE_python-pycparser:python-ply - VARIANT:=python -endef - define Package/python3-pycparser $(call Package/python-pycparser/Default) DEPENDS:= \ @@ -50,22 +40,14 @@ $(call Package/python-pycparser/Default) VARIANT:=python3 endef -define Package/python-pycparser/description +define Package/python3-pycparser/description pycparser is a parser for the C language, written in pure Python. It is a module designed to be easily integrated into applications that need to parse C source code. -endef - -define Package/python3-pycparser/description -$(call Package/python-pycparser/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-pycparser)) -$(eval $(call BuildPackage,python-pycparser)) -$(eval $(call BuildPackage,python-pycparser-src)) - $(eval $(call Py3Package,python3-pycparser)) $(eval $(call BuildPackage,python3-pycparser)) $(eval $(call BuildPackage,python3-pycparser-src)) diff --git a/lang/python/python-pyopenssl/Makefile b/lang/python/python-pyopenssl/Makefile index 53dccc306..e693cacd3 100644 --- a/lang/python/python-pyopenssl/Makefile +++ b/lang/python/python-pyopenssl/Makefile @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:pyopenssl_project:pyopenssl include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyopenssl/Default @@ -32,15 +31,6 @@ define Package/python-pyopenssl/Default URL:=https://pyopenssl.org/ endef -define Package/python-pyopenssl -$(call Package/python-pyopenssl/Default) - DEPENDS:= \ - +PACKAGE_python-pyopenssl:python-light \ - +PACKAGE_python-pyopenssl:python-cryptography \ - +PACKAGE_python-pyopenssl:python-six - VARIANT:=python -endef - define Package/python3-pyopenssl $(call Package/python-pyopenssl/Default) DEPENDS:= \ @@ -50,20 +40,12 @@ $(call Package/python-pyopenssl/Default) VARIANT:=python3 endef -define Package/python-pyopenssl/description -Python wrapper module around the OpenSSL library -endef - define Package/python3-pyopenssl/description -$(call Package/python-pyopenssl/description) +Python wrapper module around the OpenSSL library . (Variant for Python3). endef -$(eval $(call PyPackage,python-pyopenssl)) -$(eval $(call BuildPackage,python-pyopenssl)) -$(eval $(call BuildPackage,python-pyopenssl-src)) - $(eval $(call Py3Package,python3-pyopenssl)) $(eval $(call BuildPackage,python3-pyopenssl)) $(eval $(call BuildPackage,python3-pyopenssl-src)) diff --git a/lang/python/python-pyptlib/Makefile b/lang/python/python-pyptlib/Makefile deleted file mode 100644 index 9c0403ab3..000000000 --- a/lang/python/python-pyptlib/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2015, 2017-2018 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:=python-pyptlib -PKG_VERSION:=0.0.6 -PKG_RELEASE:=3 - -PYPI_NAME:=pyptlib -PKG_HASH:=b98472e3d9e8f4689d3913ca8f89afa5e6cc5383dcd8686987606166f9dac607 - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/python-pyptlib/Default - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Pluggable Transports for Tor - URL:=https://pypi.org/project/pyptlib/ -endef - -define Package/python-pyptlib -$(call Package/python-pyptlib/Default) - DEPENDS:=+PACKAGE_python-pyptlib:python-light - VARIANT:=python -endef - -define Package/python-pyptlib/description -A python implementation of the Pluggable Transports for Circumvention -specification for Tor -endef - -$(eval $(call PyPackage,python-pyptlib)) -$(eval $(call BuildPackage,python-pyptlib)) -$(eval $(call BuildPackage,python-pyptlib-src)) diff --git a/lang/python/python-pyserial/Makefile b/lang/python/python-pyserial/Makefile index ca80e6c48..7cc4ec91f 100644 --- a/lang/python/python-pyserial/Makefile +++ b/lang/python/python-pyserial/Makefile @@ -19,7 +19,6 @@ PKG_MAINTAINER:=Micke Prag <micke.prag@telldus.se> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pyserial/Default @@ -29,13 +28,6 @@ define Package/python-pyserial/Default URL:=https://github.com/pyserial/pyserial endef -define Package/python-pyserial -$(call Package/python-pyserial/Default) - TITLE:=python-pyserial - DEPENDS:=+PACKAGE_python-pyserial:python-light - VARIANT:=python -endef - define Package/python3-pyserial $(call Package/python-pyserial/Default) TITLE:=python3-pyserial @@ -43,23 +35,15 @@ $(call Package/python-pyserial/Default) VARIANT:=python3 endef -define Package/python-pyserial/description +define Package/python3-pyserial/description This module encapsulates the access for the serial port. It provides backends for Python running on Windows, OSX, Linux, BSD (possibly any POSIX compliant system) and IronPython. The module named "serial" automatically selects the appropriate backend. -endef - -define Package/python3-pyserial/description -$(call Package/python-pyserial/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-pyserial)) -$(eval $(call BuildPackage,python-pyserial)) -$(eval $(call BuildPackage,python-pyserial-src)) - $(eval $(call Py3Package,python3-pyserial)) $(eval $(call BuildPackage,python3-pyserial)) $(eval $(call BuildPackage,python3-pyserial-src)) diff --git a/lang/python/python-pytz/Makefile b/lang/python/python-pytz/Makefile index bdff0ac50..f421b198b 100644 --- a/lang/python/python-pytz/Makefile +++ b/lang/python/python-pytz/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE.txt include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-pytz/Default @@ -30,13 +29,6 @@ define Package/python-pytz/Default URL:=https://pythonhosted.org/pytz/ endef -define Package/python-pytz -$(call Package/python-pytz/Default) - TITLE:=World timezone definitions, modern and historical - DEPENDS:=+PACKAGE_python-pytz:python-light - VARIANT:=python -endef - define Package/python3-pytz $(call Package/python-pytz/Default) TITLE:=World timezone definitions, modern and historical for Python3 @@ -44,20 +36,12 @@ $(call Package/python-pytz/Default) VARIANT:=python3 endef -define Package/python-pytz/description - World timezone definitions, modern and historical -endef - define Package/python3-pytz/description -$(call Package/python-pytz/description) + World timezone definitions, modern and historical . (Variant for Python3) endef -$(eval $(call PyPackage,python-pytz)) -$(eval $(call BuildPackage,python-pytz)) -$(eval $(call BuildPackage,python-pytz-src)) - $(eval $(call Py3Package,python3-pytz)) $(eval $(call BuildPackage,python3-pytz)) $(eval $(call BuildPackage,python3-pytz-src)) diff --git a/lang/python/python-qrcode/Makefile b/lang/python/python-qrcode/Makefile index 63c08db39..1628c90d0 100644 --- a/lang/python/python-qrcode/Makefile +++ b/lang/python/python-qrcode/Makefile @@ -18,7 +18,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-qrcode/Default @@ -29,20 +28,6 @@ define Package/python-qrcode/Default URL:=https://github.com/lincolnloop/python-qrcode endef -define Package/python-qrcode -$(call Package/python-qrcode/Default) - DEPENDS:= \ - +PACKAGE_python-qrcode:python \ - +PACKAGE_python-qrcode:python-setuptools \ - +PACKAGE_python-qrcode:python-six \ - +PACKAGE_python-qrcode:python-pillow - VARIANT:=python -endef - -define Package/python-qrcode/description - Pure python QR Code generator -endef - define Package/python3-qrcode $(call Package/python-qrcode/Default) DEPENDS:= \ @@ -54,15 +39,11 @@ $(call Package/python-qrcode/Default) endef define Package/python3-qrcode/description -$(call Package/python-qrcode/description) + Pure python QR Code generator . (Variant for Python3) endef -$(eval $(call PyPackage,python-qrcode)) -$(eval $(call BuildPackage,python-qrcode)) -$(eval $(call BuildPackage,python-qrcode-src)) - $(eval $(call Py3Package,python3-qrcode)) $(eval $(call BuildPackage,python3-qrcode)) $(eval $(call BuildPackage,python3-qrcode-src)) diff --git a/lang/python/python-rcssmin/Makefile b/lang/python/python-rcssmin/Makefile index 2a812920f..7791a8b4d 100644 --- a/lang/python/python-rcssmin/Makefile +++ b/lang/python/python-rcssmin/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-rcssmin/Default @@ -29,14 +28,6 @@ define Package/python-rcssmin/Default URL:=http://opensource.perlig.de/rcssmin/ endef -define Package/python-rcssmin - $(call Package/python-rcssmin/Default) - DEPENDS:= \ - +PACKAGE_python-rcssmin:python-light \ - +PACKAGE_python-rcssmin:python-codecs - VARIANT:=python -endef - define Package/python3-rcssmin $(call Package/python-rcssmin/Default) DEPENDS:= \ @@ -44,24 +35,16 @@ define Package/python3-rcssmin VARIANT:=python3 endef -define Package/python-rcssmin/description +define Package/python3-rcssmin/description This module is a re-implementation aiming for speed instead of maximum compression, so it can be used at runtime (rather than during a preprocessing step). RCSSmin does syntactical compression only (removing spaces, comments and possibly semicolons). It does not provide semantic compression (like removing empty blocks, collapsing redundant properties etc). -endef - -define Package/python3-rcssmin/description -$(call Package/python-rcssmin/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-rcssmin)) -$(eval $(call BuildPackage,python-rcssmin)) -$(eval $(call BuildPackage,python-rcssmin-src)) - $(eval $(call Py3Package,python3-rcssmin)) $(eval $(call BuildPackage,python3-rcssmin)) $(eval $(call BuildPackage,python3-rcssmin-src)) diff --git a/lang/python/python-requests-oauthlib/Makefile b/lang/python/python-requests-oauthlib/Makefile index 30b00d614..6cd863d06 100644 --- a/lang/python/python-requests-oauthlib/Makefile +++ b/lang/python/python-requests-oauthlib/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-requests-oauthlib/Default @@ -29,15 +28,6 @@ define Package/python-requests-oauthlib/Default URL:=https://github.com/requests/requests-oauthlib endef -define Package/python-requests-oauthlib - $(call Package/python-requests-oauthlib/Default) - DEPENDS:= \ - +PACKAGE_python-requests-oauthlib:python \ - +PACKAGE_python-requests-oauthlib:python-oauthlib \ - +PACKAGE_python-requests-oauthlib:python-requests - VARIANT:=python -endef - define Package/python3-requests-oauthlib $(call Package/python-requests-oauthlib/Default) DEPENDS:= \ @@ -47,21 +37,13 @@ define Package/python3-requests-oauthlib VARIANT:=python3 endef -define Package/python-requests-oauthlib/description +define Package/python3-requests-oauthlib/description This python package provides first-class OAuth library support for Requests. -endef - -define Package/python3-requests-oauthlib/description -$(call Package/python-requests-oauthlib/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-requests-oauthlib)) -$(eval $(call BuildPackage,python-requests-oauthlib)) -$(eval $(call BuildPackage,python-requests-oauthlib-src)) - $(eval $(call Py3Package,python3-requests-oauthlib)) $(eval $(call BuildPackage,python3-requests-oauthlib)) $(eval $(call BuildPackage,python3-requests-oauthlib-src)) diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index d7573ed9d..9a33e315f 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -21,7 +21,6 @@ PKG_HASH:=b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-requests/Default @@ -32,17 +31,6 @@ define Package/python-requests/Default URL:=https://2.python-requests.org/ endef -define Package/python-requests -$(call Package/python-requests/Default) - DEPENDS:= \ - +PACKAGE_python-requests:python \ - +PACKAGE_python-requests:python-chardet \ - +PACKAGE_python-requests:python-idna \ - +PACKAGE_python-requests:python-urllib3 \ - +PACKAGE_python-requests:python-certifi - VARIANT:=python -endef - define Package/python3-requests $(call Package/python-requests/Default) DEPENDS:= \ @@ -54,20 +42,12 @@ $(call Package/python-requests/Default) VARIANT:=python3 endef -define Package/python-requests/description - Requests is the only Non-GMO HTTP library for Python, safe for human consumption -endef - define Package/python3-requests/description -$(call Package/python-requests/description) + Requests is the only Non-GMO HTTP library for Python, safe for human consumption . (Variant for Python3) endef -$(eval $(call PyPackage,python-requests)) -$(eval $(call BuildPackage,python-requests)) -$(eval $(call BuildPackage,python-requests-src)) - $(eval $(call Py3Package,python3-requests)) $(eval $(call BuildPackage,python3-requests)) $(eval $(call BuildPackage,python3-requests-src)) diff --git a/lang/python/python-rsa/Makefile b/lang/python/python-rsa/Makefile index 9bdca772a..eba462f63 100644 --- a/lang/python/python-rsa/Makefile +++ b/lang/python/python-rsa/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-rsa/Default @@ -23,34 +22,20 @@ define Package/python-rsa/Default URL:=https://stuvel.eu/rsa endef -define Package/python-rsa -$(call Package/python-rsa/Default) - DEPENDS:=+PACKAGE_python-rsa:python +PACKAGE_python-rsa:python-pyasn1 - VARIANT:=python -endef - define Package/python3-rsa $(call Package/python-rsa/Default) DEPENDS:=+PACKAGE_python3-rsa:python3 +PACKAGE_python3-rsa:python3-pyasn1 VARIANT:=python3 endef -define Package/python-rsa/description +define Package/python3-rsa/description Is a pure-Python RSA implementation. It supports encryption and decryption, signing and verifying signatures, and key generation according to PKCS#1 version 1.5. It can be used as a Python library as well as on the commandline. -endef - -define Package/python3-rsa/description -$(call Package/python-rsa/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-rsa)) -$(eval $(call BuildPackage,python-rsa)) -$(eval $(call BuildPackage,python-rsa-src)) - $(eval $(call Py3Package,python3-rsa)) $(eval $(call BuildPackage,python3-rsa)) $(eval $(call BuildPackage,python3-rsa-src)) diff --git a/lang/python/python-s3transfer/Makefile b/lang/python/python-s3transfer/Makefile index 5ed85e9d8..e49212f6c 100644 --- a/lang/python/python-s3transfer/Makefile +++ b/lang/python/python-s3transfer/Makefile @@ -12,7 +12,6 @@ PKG_LICENSE:=MIT include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-s3transfer/Default @@ -23,15 +22,6 @@ define Package/python-s3transfer/Default URL:=https://github.com/boto/s3transfer endef -define Package/python-s3transfer -$(call Package/python-s3transfer/Default) - DEPENDS:= \ - +PACKAGE_python-s3transfer:python \ - +PACKAGE_python-s3transfer:python-botocore \ - +PACKAGE_python-s3transfer:python-futures - VARIANT:=python -endef - define Package/python3-s3transfer $(call Package/python-s3transfer/Default) DEPENDS:= \ @@ -40,20 +30,12 @@ $(call Package/python-s3transfer/Default) VARIANT:=python3 endef -define Package/python-s3transfer/description -S3transfer is a Python library for managing Amazon S3 transfers. -endef - define Package/python3-s3transfer/description -$(call Package/python-s3transfer/description) +S3transfer is a Python library for managing Amazon S3 transfers. . (Variant for Python3) endef -$(eval $(call PyPackage,python-s3transfer)) -$(eval $(call BuildPackage,python-s3transfer)) -$(eval $(call BuildPackage,python-s3transfer-src)) - $(eval $(call Py3Package,python3-s3transfer)) $(eval $(call BuildPackage,python3-s3transfer)) $(eval $(call BuildPackage,python3-s3transfer-src)) diff --git a/lang/python/python-service-identity/Makefile b/lang/python/python-service-identity/Makefile index dc99d4b79..5810e1d57 100644 --- a/lang/python/python-service-identity/Makefile +++ b/lang/python/python-service-identity/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-service-identity/Default @@ -31,18 +30,6 @@ define Package/python-service-identity/Default URL:=https://service-identity.readthedocs.io/ endef -define Package/python-service-identity -$(call Package/python-service-identity/Default) - DEPENDS:= \ - +PACKAGE_python-service-identity:python-light \ - +PACKAGE_python-service-identity:python-attrs \ - +PACKAGE_python-service-identity:python-cryptography \ - +PACKAGE_python-service-identity:python-ipaddress \ - +PACKAGE_python-service-identity:python-pyasn1 \ - +PACKAGE_python-service-identity:python-pyasn1-modules - VARIANT:=python -endef - define Package/python3-service-identity $(call Package/python-service-identity/Default) DEPENDS:= \ @@ -54,21 +41,13 @@ $(call Package/python-service-identity/Default) VARIANT:=python3 endef -define Package/python-service-identity/description +define Package/python3-service-identity/description service_identity aspires to give you all the tools you need for verifying whether a certificate is valid for the intended purposes. -endef - -define Package/python3-service-identity/description -$(call Package/python-service-identity/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-service-identity)) -$(eval $(call BuildPackage,python-service-identity)) -$(eval $(call BuildPackage,python-service-identity-src)) - $(eval $(call Py3Package,python3-service-identity)) $(eval $(call BuildPackage,python3-service-identity)) $(eval $(call BuildPackage,python3-service-identity-src)) diff --git a/lang/python/python-simplejson/Makefile b/lang/python/python-simplejson/Makefile index d8a2558fa..808c73871 100644 --- a/lang/python/python-simplejson/Makefile +++ b/lang/python/python-simplejson/Makefile @@ -18,7 +18,6 @@ PKG_HASH:=2b4b2b738b3b99819a17feaf118265d0753d5536049ea570b3c43b51c4701e81 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-simplejson/Default @@ -29,13 +28,6 @@ define Package/python-simplejson/Default URL:=https://simplejson.readthedocs.org/ endef -define Package/python-simplejson -$(call Package/python-simplejson/Default) - TITLE:=Simple, fast, extensible JSON encoder/decoder for Python 2 - DEPENDS:=+PACKAGE_python-simplejson:python-light +PACKAGE_python-simplejson:python-decimal - VARIANT:=python -endef - define Package/python3-simplejson $(call Package/python-simplejson/Default) TITLE:=Simple, fast, extensible JSON encoder/decoder for Python3 @@ -43,30 +35,17 @@ $(call Package/python-simplejson/Default) VARIANT:=python3 endef -define Package/python-simplejson/description - Simple, fast, extensible JSON encoder/decoder for Python -endef - define Package/python3-simplejson/description -$(call Package/python-simplejson/description) + Simple, fast, extensible JSON encoder/decoder for Python . (Variant for Python3) endef -define PyPackage/python-simplejson/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/simplejson/tests -endef - define Py3Package/python3-simplejson/filespec +|$(PYTHON3_PKG_DIR) -|$(PYTHON3_PKG_DIR)/simplejson/tests endef -$(eval $(call PyPackage,python-simplejson)) -$(eval $(call BuildPackage,python-simplejson)) -$(eval $(call BuildPackage,python-simplejson-src)) - $(eval $(call Py3Package,python3-simplejson)) $(eval $(call BuildPackage,python3-simplejson)) $(eval $(call BuildPackage,python3-simplejson-src)) diff --git a/lang/python/python-six/Makefile b/lang/python/python-six/Makefile index 4125139dc..3f0250d26 100644 --- a/lang/python/python-six/Makefile +++ b/lang/python/python-six/Makefile @@ -23,7 +23,6 @@ HOST_BUILD_DEPENDS:=python3/host include ../pypi.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-six/Default @@ -34,27 +33,17 @@ define Package/python-six/Default URL:=https://github.com/benjaminp/six endef -define Package/python-six -$(call Package/python-six/Default) - DEPENDS:=+PACKAGE_python-six:python-light - VARIANT:=python -endef - define Package/python3-six $(call Package/python-six/Default) DEPENDS:=+PACKAGE_python3-six:python3-light VARIANT:=python3 endef -define Package/python-six/description +define Package/python3-six/description Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. -endef - -define Package/python3-six/description -$(call Package/python-six/description) . (Variant for Python3) endef @@ -67,10 +56,6 @@ Host/Install:= $(eval $(call HostBuild)) -$(eval $(call PyPackage,python-six)) -$(eval $(call BuildPackage,python-six)) -$(eval $(call BuildPackage,python-six-src)) - $(eval $(call Py3Package,python3-six)) $(eval $(call BuildPackage,python3-six)) $(eval $(call BuildPackage,python3-six-src)) diff --git a/lang/python/python-twisted/Makefile b/lang/python/python-twisted/Makefile index e91743d7c..ee72d39a0 100644 --- a/lang/python/python-twisted/Makefile +++ b/lang/python/python-twisted/Makefile @@ -24,7 +24,6 @@ PKG_CPE_ID:=cpe:/a:twistedmatrix:twisted include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-twisted/Default @@ -35,20 +34,6 @@ define Package/python-twisted/Default URL:=https://twistedmatrix.com/ endef -define Package/python-twisted -$(call Package/python-twisted/Default) - DEPENDS:= \ - +PACKAGE_python-twisted:python-light \ - +PACKAGE_python-twisted:python-attrs \ - +PACKAGE_python-twisted:python-automat \ - +PACKAGE_python-twisted:python-constantly \ - +PACKAGE_python-twisted:python-incremental \ - +PACKAGE_python-twisted:python-hyperlink \ - +PACKAGE_python-twisted:python-setuptools \ - +PACKAGE_python-twisted:python-zope-interface - VARIANT:=python -endef - define Package/python3-twisted $(call Package/python-twisted/Default) DEPENDS:= \ @@ -63,23 +48,14 @@ $(call Package/python-twisted/Default) VARIANT:=python3 endef -define Package/python-twisted/description +define Package/python3-twisted/description Twisted is a networking engine written in Python, supporting numerous protocols. It contains a web server, numerous chat clients, chat servers, mail servers, and more. -endef - -define Package/python3-twisted/description -$(call Package/python-twisted/description) . (Variant for Python3) endef -define PyPackage/python-twisted/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py -endef - define Py3Package/python3-twisted/filespec +|$(PYTHON3_PKG_DIR) -|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py @@ -93,10 +69,6 @@ define Py3Package/python3-twisted/install done endef -$(eval $(call PyPackage,python-twisted)) -$(eval $(call BuildPackage,python-twisted)) -$(eval $(call BuildPackage,python-twisted-src)) - $(eval $(call Py3Package,python3-twisted)) $(eval $(call BuildPackage,python3-twisted)) $(eval $(call BuildPackage,python3-twisted-src)) diff --git a/lang/python/python-txsocksx/Makefile b/lang/python/python-txsocksx/Makefile deleted file mode 100644 index 9a0e2db7e..000000000 --- a/lang/python/python-txsocksx/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2015, 2017-2018 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:=python-txsocksx -PKG_VERSION:=1.15.0.2 -PKG_RELEASE:=4 - -PYPI_NAME:=txsocksx -PKG_HASH:=4f79b5225ce29709bfcee45e6f726e65b70fd6f1399d1898e54303dbd6f8065f - -PKG_LICENSE:=ISC -PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -PYTHON_PKG_SETUP_VARS:= \ - PKG_VERSION="$(PKG_VERSION)" - -define Package/python-txsocksx/Default - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=SOCKS client endpoints for Twisted - URL:=https://github.com/habnabit/txsocksx -endef - -define Package/python-txsocksx -$(call Package/python-txsocksx/Default) - DEPENDS:= \ - +PACKAGE_python-txsocksx:python-light \ - +PACKAGE_python-txsocksx:python-parsley \ - +PACKAGE_python-txsocksx:python-twisted - VARIANT:=python -endef - -define Package/python-txsocksx/description -txsocksx is SOCKS4/4a and SOCKS5 client endpoints for Twisted 10.1 or -greater. -endef - -$(eval $(call PyPackage,python-txsocksx)) -$(eval $(call BuildPackage,python-txsocksx)) -$(eval $(call BuildPackage,python-txsocksx-src)) diff --git a/lang/python/python-txsocksx/patches/001-omit-tests.patch b/lang/python/python-txsocksx/patches/001-omit-tests.patch deleted file mode 100644 index 2bed548d7..000000000 --- a/lang/python/python-txsocksx/patches/001-omit-tests.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -35,5 +35,5 @@ setup( - 'version_module_paths': ['txsocksx/_version.py'], - }, - install_requires=install_requires, -- packages=['txsocksx', 'txsocksx.test'], -+ packages=['txsocksx'], - ) diff --git a/lang/python/python-txsocksx/patches/002-do-not-use-vcversioner.patch b/lang/python/python-txsocksx/patches/002-do-not-use-vcversioner.patch deleted file mode 100644 index c7c2cbbaa..000000000 --- a/lang/python/python-txsocksx/patches/002-do-not-use-vcversioner.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,8 @@ - # Copyright (c) Aaron Gallagher <_@habnab.it> - # See COPYING for details. - -+import os -+ - from setuptools import setup - - -@@ -30,10 +32,11 @@ setup( - ], - license='ISC', - -- setup_requires=['vcversioner>=1'], -- vcversioner={ -- 'version_module_paths': ['txsocksx/_version.py'], -- }, -+ #setup_requires=['vcversioner>=1'], -+ #vcversioner={ -+ # 'version_module_paths': ['txsocksx/_version.py'], -+ #}, -+ version=os.environ.get('PKG_VERSION'), - install_requires=install_requires, - packages=['txsocksx'], - ) diff --git a/lang/python/python-urllib3/Makefile b/lang/python/python-urllib3/Makefile index 7802c1ab3..d291773f5 100644 --- a/lang/python/python-urllib3/Makefile +++ b/lang/python/python-urllib3/Makefile @@ -21,7 +21,6 @@ PKG_HASH:=f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-urllib3/Default @@ -32,16 +31,6 @@ define Package/python-urllib3/Default URL:=https://urllib3.readthedocs.io/ endef -define Package/python-urllib3 -$(call Package/python-urllib3/Default) - DEPENDS:=+PACKAGE_python-urllib3:python - VARIANT:=python -endef - -define Package/python-urllib3/description - HTTP library with thread-safe connection pooling, file post, and more. -endef - define Package/python3-urllib3 $(call Package/python-urllib3/Default) DEPENDS:=+PACKAGE_python3-urllib3:python3 @@ -49,15 +38,11 @@ $(call Package/python-urllib3/Default) endef define Package/python3-urllib3/description -$(call Package/python-urllib3/description) + HTTP library with thread-safe connection pooling, file post, and more. . (Variant for Python3) endef -$(eval $(call PyPackage,python-urllib3)) -$(eval $(call BuildPackage,python-urllib3)) -$(eval $(call BuildPackage,python-urllib3-src)) - $(eval $(call Py3Package,python3-urllib3)) $(eval $(call BuildPackage,python3-urllib3)) $(eval $(call BuildPackage,python3-urllib3-src)) diff --git a/lang/python/python-voluptuous/Makefile b/lang/python/python-voluptuous/Makefile index 910f82a51..bcac10b07 100644 --- a/lang/python/python-voluptuous/Makefile +++ b/lang/python/python-voluptuous/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-voluptuous/Default @@ -31,13 +30,6 @@ define Package/python-voluptuous/Default URL:=https://github.com/alecthomas/voluptuous endef -define Package/python-voluptuous -$(call Package/python-voluptuous/Default) - DEPENDS:= \ - +PACKAGE_python-voluptuous:python-light - VARIANT:=python -endef - define Package/python3-voluptuous $(call Package/python-voluptuous/Default) DEPENDS:= \ @@ -45,20 +37,12 @@ $(call Package/python-voluptuous/Default) VARIANT:=python3 endef -define Package/python-voluptuous/description -It is primarily intended for validating data coming into Python as JSON, YAML, etc. -endef - define Package/python3-voluptuous/description -$(call Package/python-voluptuous/description) +It is primarily intended for validating data coming into Python as JSON, YAML, etc. . (Variant for Python3) endef -$(eval $(call PyPackage,python-voluptuous)) -$(eval $(call BuildPackage,python-voluptuous)) -$(eval $(call BuildPackage,python-voluptuous-src)) - $(eval $(call Py3Package,python3-voluptuous)) $(eval $(call BuildPackage,python3-voluptuous)) $(eval $(call BuildPackage,python3-voluptuous-src)) diff --git a/lang/python/python-yaml/Makefile b/lang/python/python-yaml/Makefile index 46eaeaeb1..dbca6deb5 100644 --- a/lang/python/python-yaml/Makefile +++ b/lang/python/python-yaml/Makefile @@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:pyyaml_project:pyyaml include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-yaml/Default @@ -33,39 +32,21 @@ define Package/python-yaml/Default DEPENDS:=+libyaml endef -define Package/python-yaml -$(call Package/python-yaml/Default) - DEPENDS+= \ - +PACKAGE_python-yaml:python-light \ - +PACKAGE_python-yaml:python-codecs - VARIANT:=python -endef - define Package/python3-yaml $(call Package/python-yaml/Default) DEPENDS+=+PACKAGE_python3-yaml:python3-light VARIANT:=python3 endef -define Package/python-yaml/description - PyYAML is a YAML parser and emitter for the Python programming language. -endef - define Package/python3-yaml/description -$(call Package/python-yaml/description) + PyYAML is a YAML parser and emitter for the Python programming language. . (Variant for Python3) endef -PYTHON_PKG_SETUP_GLOBAL_ARGS:=--with-libyaml -PYTHON_PKG_SETUP_ARGS:= PYTHON3_PKG_SETUP_GLOBAL_ARGS:=--with-libyaml PYTHON3_PKG_SETUP_ARGS:= -$(eval $(call PyPackage,python-yaml)) -$(eval $(call BuildPackage,python-yaml)) -$(eval $(call BuildPackage,python-yaml-src)) - $(eval $(call Py3Package,python3-yaml)) $(eval $(call BuildPackage,python3-yaml)) $(eval $(call BuildPackage,python3-yaml-src)) diff --git a/lang/python/python-zope-interface/Makefile b/lang/python/python-zope-interface/Makefile index 06bda5718..47674f7bc 100644 --- a/lang/python/python-zope-interface/Makefile +++ b/lang/python/python-zope-interface/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-zope-interface/Default @@ -31,35 +30,21 @@ define Package/python-zope-interface/Default URL:=https://github.com/zopefoundation/zope.interface endef -define Package/python-zope-interface -$(call Package/python-zope-interface/Default) - DEPENDS:=+PACKAGE_python-zope-interface:python-light - VARIANT:=python -endef - define Package/python3-zope-interface $(call Package/python-zope-interface/Default) DEPENDS:=+PACKAGE_python3-zope-interface:python3-light VARIANT:=python3 endef -define Package/python-zope-interface/description +define Package/python3-zope-interface/description This package provides an implementation of "object interfaces" for Python. Interfaces are a mechanism for labeling objects as conforming to a given API or contract. So, this package can be considered as implementation of the Design By Contract methodology support in Python. -endef - -define Package/python3-zope-interface/description -$(call Package/python-zope-interface/description) . (Variant for Python3) endef -$(eval $(call PyPackage,python-zope-interface)) -$(eval $(call BuildPackage,python-zope-interface)) -$(eval $(call BuildPackage,python-zope-interface-src)) - $(eval $(call Py3Package,python3-zope-interface)) $(eval $(call BuildPackage,python3-zope-interface)) $(eval $(call BuildPackage,python3-zope-interface-src)) diff --git a/lang/python/ruamel-yaml/Makefile b/lang/python/ruamel-yaml/Makefile index bf8119f68..0fa9f1a38 100644 --- a/lang/python/ruamel-yaml/Makefile +++ b/lang/python/ruamel-yaml/Makefile @@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=LICENSE include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/ruamel-yaml/Default @@ -31,13 +30,6 @@ define Package/ruamel-yaml/Default URL:=https://bitbucket.org/ruamel/yaml endef -define Package/python-ruamel-yaml -$(call Package/ruamel-yaml/Default) - DEPENDS:= \ - +PACKAGE_python-ruamel-yaml:python-light - VARIANT:=python -endef - define Package/python3-ruamel-yaml $(call Package/ruamel-yaml/Default) DEPENDS:= \ @@ -45,20 +37,12 @@ $(call Package/ruamel-yaml/Default) VARIANT:=python3 endef -define Package/ruamel-yaml/description -ruamel-yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order -endef - define Package/python3-ruamel-yaml/description -$(call Package/ruamel-yaml/description) +ruamel-yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order . (Variant for Python3) endef -$(eval $(call PyPackage,python-ruamel-yaml)) -$(eval $(call BuildPackage,python-ruamel-yaml)) -$(eval $(call BuildPackage,python-ruamel-yaml-src)) - $(eval $(call Py3Package,python3-ruamel-yaml)) $(eval $(call BuildPackage,python3-ruamel-yaml)) $(eval $(call BuildPackage,python3-ruamel-yaml-src)) diff --git a/lang/python/text-unidecode/Makefile b/lang/python/text-unidecode/Makefile index cb351c53a..88acb06f8 100644 --- a/lang/python/text-unidecode/Makefile +++ b/lang/python/text-unidecode/Makefile @@ -20,7 +20,6 @@ PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz> include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-text-unidecode/Default @@ -31,13 +30,6 @@ define Package/python-text-unidecode/Default URL:=https://github.com/kmike/text-unidecode/ endef -define Package/python-text-unidecode -$(call Package/python-text-unidecode/Default) - DEPENDS:= \ - +PACKAGE_python-text-unidecode:python-light - VARIANT:=python -endef - define Package/python3-text-unidecode $(call Package/python-text-unidecode/Default) DEPENDS:= \ @@ -45,20 +37,12 @@ $(call Package/python-text-unidecode/Default) VARIANT:=python3 endef -define Package/python-text-unidecode/description -text-unidecode is the most basic port of the Text::Unidecode Perl library. -endef - define Package/python3-text-unidecode/description -$(call Package/python-text-unidecode/description) +text-unidecode is the most basic port of the Text::Unidecode Perl library. . (Variant for Python3) endef -$(eval $(call PyPackage,python-text-unidecode)) -$(eval $(call BuildPackage,python-text-unidecode)) -$(eval $(call BuildPackage,python-text-unidecode-src)) - $(eval $(call Py3Package,python3-text-unidecode)) $(eval $(call BuildPackage,python3-text-unidecode)) $(eval $(call BuildPackage,python3-text-unidecode-src)) diff --git a/lang/python/vobject/Makefile b/lang/python/vobject/Makefile index 49e81e143..7afdd59c0 100644 --- a/lang/python/vobject/Makefile +++ b/lang/python/vobject/Makefile @@ -14,7 +14,6 @@ PKG_HASH:=96512aec74b90abb71f6b53898dd7fe47300cc940104c4f79148f0671f790101 include ../pypi.mk include $(INCLUDE_DIR)/package.mk -include ../python-package.mk include ../python3-package.mk define Package/python-vobject/Default @@ -26,31 +25,18 @@ define Package/python-vobject/Default URL:=http://eventable.github.io/vobject/ endef -define Package/python-vobject -$(call Package/python-vobject/Default) - DEPENDS:=+PACKAGE_python-vobject:python +PACKAGE_python-vobject:python-dateutil - VARIANT:=python -endef - define Package/python3-vobject $(call Package/python-vobject/Default) DEPENDS:=+PACKAGE_python3-vobject:python3 +PACKAGE_python3-vobject:python3-dateutil VARIANT:=python3 endef -define Package/python-vobject/description - vCard and vCalendar support for Python -endef - define Package/python3-vobject/description -$(call Package/python-vobject/description) + vCard and vCalendar support for Python . (Variant for Python3) endef -$(eval $(call PyPackage,python-vobject)) -$(eval $(call BuildPackage,python-vobject)) -$(eval $(call BuildPackage,python-vobject-src)) $(eval $(call Py3Package,python3-vobject)) $(eval $(call BuildPackage,python3-vobject)) $(eval $(call BuildPackage,python3-vobject-src)) |