Commit Graph

1239 Commits

Author SHA1 Message Date
Hannu Nyman
96ae56b1e5 Merge pull request #9093 from jefferyto/python-host-ensurepip-upgrade-uninstall
python,python3: Use ensurepip=upgrade for host Python
2019-05-29 19:36:29 +03:00
Hannu Nyman
7d9511ae9d Merge pull request #9085 from commodo/readme-multi-package-feeds
lang: python: readme: document mechanism for corner-case python[3]-package.mk location
2019-05-29 19:35:43 +03:00
Jeffery To
c94c98efca python-cffi,python-cryptography: Fix build depends
python-cryptography's build depends (host cffi, libffi) were transferred
to python-cffi at some point; this corrects the situation.

python-cryptography's host Python build depends is copied from its
setup.py[1].

[1]: https://github.com/pyca/cryptography/blob/2.6.1/setup.py#L47

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 23:08:19 +08:00
Jeffery To
b8e7a197db python3-setuptools,python3-pip: Use more predictable pycache cleanup
This uses two find commands to delete __pycache__ contents then the
__pycache__ directories, rather than a for loop.

The second command omits a -empty test, so that if the first command
doesn't remove all directory contents for some reason, the second
command will return an error (find will not delete a non-empty
directory).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 22:42:02 +08:00
Jeffery To
be751236aa python-setuptools,python-pip: Change prefix to /usr
This changes the --prefix option, passed to host pip when "installing"
target setuptools and pip, to /usr, in case the prefix is recorded in
the packages.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 22:38:30 +08:00
Jeffery To
688825f37a python-setuptools,python-pip: Set pip cache dir, disable version check
This adds --cache-dir and --disable-pip-version-check options for host
pip, when "installing" target setuptools and pip.

This also changes the pip command to use $(HOST_PYTHON[3]_PIP) from
python[3]-host.mk.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 22:29:20 +08:00
Jeffery To
87a31e49f7 python,python3: Disable user site-packages for host Python
Normally, Python will include the user's site-packages directory
(~/.local/lib/python$(PYTHON_VERSION)/site-packages) in it's internal
search path for modules.

This disables this default inclusion for host Python.

This change is applied during Host/Configure instead of as a patch to
keep this setting unchanged for target Python.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 22:03:18 +08:00
Jeffery To
ae80ddc7ab python,python3: Update host pip[3] install functions
* Add --cache-dir option to set the pip cache to a directory in
$(DL_DIR), instead of pip's default (build user's ~/.cache/pip),
fixes #9066

* Add --disable-pip-version-check option, since the version check only
prints a message saying a new version is available

* Combine host_python_pip_install and host_python_pip_install_host into
Build/Compile/HostPy[3]PipInstall

* Remove --root and --prefix options, since this function is only used
to install packages to host Python's default site-packages directory
(setting these may serve to confuse pip)

* Pass all of $(HOST_PYTHON[3]_PACKAGE_BUILD_DEPENDS) to the function,
since pip can handle multiple arguments/packages

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-29 21:45:16 +08:00
Alexandru Ardelean
d607b4da7b lang: python: readme: document mechanism for corner-case python[3]-package.mk location
After some thinking over this, documenting this behavior makes sense
versus adding some functionst to handle this.
There is some validity/use-cases where some users may want to reference
a python[3]-package.mk from some other location as well as have the
flexibility to change it (locally). One example can be when the local
`packages` is renamed to something else.

This does not fall on the responsibility of the Python maintainers, but
it can be documented.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-05-28 21:38:01 +03:00
Jeffery To
af5288827e python,python3: Use ensurepip=upgrade for host Python
This changes --with-ensurepip=install to upgrade, to upgrade host
versions of setuptools and pip to the Python-bundled versions.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-28 20:27:13 +08:00
Jeffery To
6952970b2e python,python3: Clear more fields for src packages
This clears the CONFLICTS, PROVIDES, EXTRA_DEPENDS, and USERID fields
for -src packages.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-28 00:43:26 +08:00
Josef Schlehofer
9a76b31814 python-urllib3: update to version 1.25.3
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-05-26 23:57:01 +02:00
Rosen Penev
10dd4f4720 Merge pull request #9060 from jefferyto/python-setuptools-reproducible
python-setuptools: Add reproducibility patches from Debian
2019-05-25 16:11:43 -07:00
Jeffery To
6bd527df2e python-chardet: Rename Python 3 script
The Python 2 and 3 versions of chardet both install a script with the
same name (/usr/bin/chardetect). This is the issue identified in #9006
(https://github.com/openwrt/packages/pull/9006#issuecomment-493709812).

This renames the Python 3 script to chardetect3.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-25 04:28:53 +08:00
Eneas U de Queiroz
ea781a938c python-requests-oauthlib: add python3, clean deps
Added a python3 variant, and removed python-cryptography, and pyjwt from
the dependencies.  They are required only to run one test, that is not
even being installed.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-24 13:59:55 -03:00
Jeffery To
da35e6770d python-setuptools: Add reproducibility patches from Debian
This adds the ability to patch setuptools (and pip), and adds 3
reproducibility patches from Debian[1].
(003-PKG-INFO-output-reproducible.patch addresses the issue identified
in #9039.)

The patching is not perfect, in that the patches are applied to
setuptools and pip after they have been installed, since they are
installed from wheels which are already "precompiled".

Also, patching for the host install cannot be updated in place, for
example if a patch is added or removed.

[1]: https://sources.debian.org/patches/python-setuptools/40.8.0-1/

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-24 13:18:09 +08:00
Rosen Penev
35c93de128 Merge pull request #9047 from cotequeiroz/python-license
python-{pip,setuptools}: add LICENSE, CPE information
2019-05-21 17:14:44 -07:00
Eneas U de Queiroz
5f447b9020 python-python3-pip: add LICENSE information
CVE id was left commented out as it is not handled by uscan.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-21 14:46:13 -03:00
Eneas U de Queiroz
bbd4930ccd python-python3-setuptools: add LICENSE information
CVE id was left commented out as it is not handled by uscan.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-21 14:44:40 -03:00
Eneas U de Queiroz
5ea5d69ed3 openpyxl: bump to 2.6.2, add python3, fix depends
The current package does not work, due to missing dependencies, so they
are being added now, along with python3 support.

This versions brings many bugfixes, and the option to use defusedxml if
available, protecting against many xml exploits.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-21 10:53:52 -03:00
Eneas U de Queiroz
1044ca095f python-et_xmlfile: restore & update removed package
This is a dependency of the openpyxl package.

The package Makefile was reworked, and a python3 variant was added.
Maintainer was changed to Alexandru Ardelean & Eneas U de Queiroz.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-21 10:53:52 -03:00
Eneas U de Queiroz
d396d84d5d python-jdcal: restore & update removed package
This is a dependency of the openpyxl package.

The package Makefile was reworked, and a python3 variant was added.
Maintainer was changed to Alexandru Ardelean & Eneas U de Queiroz.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-21 10:53:52 -03:00
Rosen Penev
05cd0c24a4 Merge pull request #8993 from cotequeiroz/rcssmin
python-rcssmin: restore & update removed package, add depend to django-compressor
2019-05-21 01:20:09 -07:00
Rosen Penev
c552f138e0 Merge pull request #9040 from cotequeiroz/python-license
Python/python3: refresh license information
2019-05-21 00:45:49 -07:00
Rosen Penev
a505e173d6 Merge pull request #9039 from cotequeiroz/python_conditional
treewide: add PACKAGE_* DEPENDS conditionals to python packages building both variants, update README.md
2019-05-21 00:45:17 -07:00
Eneas U de Queiroz
00f90974b6 python3: refresh LICENSE information
Changed PKG_LICENSE to reflect spdx license tag, and PKG_LICENSE_FILES
to include all lincense-related files applicable to the parts of the
code we are actually using to build and/or distributing.  The
Windows-only files, and the python-bundled Tools we're not using have
been left out.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 18:20:43 -03:00
Eneas U de Queiroz
971b2a5218 python: refresh LICENSE information
Changed PKG_LICENSE to reflect spdx license tag, and PKG_LICENSE_FILES
to include all lincense-related files applicable to the parts of the
code we are actually using to build and/or distributing.  The
Windows-only files, and the python-bundled Tools we're not using have
been left out.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 18:18:23 -03:00
Eneas U de Queiroz
65009e8127 treewide: Add PACKAGE_* conds to python packages
If a package builds python & python3 variants, then the respective
PACKAGE-python* conditional DEPENDS were added, since circular
dependencies should all be resolved now.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 16:18:06 -03:00
Eneas U de Queiroz
36d0c59e99 python: README.md: adjust recursive dep text, misc
Adding the conditionals to DEPENDS should not cause circular
dependencies any more.  This adjusts the text to point out that it used
to be a problem, and if it happens again, one should open an issue.

Also, some spotted trivial errors were fixed.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 16:17:30 -03:00
Eneas U de Queiroz
016ef28dff django-compressor: add missing dependencies.
Added python-rcssmin, and django-appconfig as dependencies, and a note
in the package help text about not having a rjsmin package, so the
jsmin (javascript) filter will not work.
Adjusted the Makefile to conform to current python-package style, and to
display the package title correctly in menuconfig.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 11:24:37 -03:00
Eneas U de Queiroz
ef77f9940e python-rcssmin: restore & update removed package
This is a dependency of django-compressor.

The package Makefile was reworked, and a python3 variant was added.
Maintainer was changed to Alexandru Ardelean & Eneas U de Queiroz.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-20 11:03:54 -03:00
Eneas U de Queiroz
8b03ed3124 python-qrcode: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:40 -03:00
Eneas U de Queiroz
37ebbb545e python-oauthlib: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:39 -03:00
Eneas U de Queiroz
e0a0f92eb6 python-defusedxml: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:39 -03:00
Eneas U de Queiroz
436426307d python-certifi: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:39 -03:00
Eneas U de Queiroz
f33f686f40 pyjwt: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:38 -03:00
Eneas U de Queiroz
4e8697e1fe django-webpack-loader: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:38 -03:00
Eneas U de Queiroz
a7308d266b django-simple-captcha: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:38 -03:00
Eneas U de Queiroz
fe71210446 django-ranged-response: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:37 -03:00
Eneas U de Queiroz
65d36f0191 django-formtools: adjust Makefile style
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-17 23:10:37 -03:00
Josef Schlehofer
70be46618d python-requests: update to version 2.22.0
Remove patch, which is included in this release

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-05-16 23:26:33 +02:00
Eneas U de Queiroz
d3f8d69711 python-defusedxml: add new package
The defusedxml package contains several Python-only workarounds and
fixes for denial of service and other vulnerabilities in Python's XML
libraries. In order to benefit from the protection you just have to
import and use the listed functions / classes from the right defusedxml
module instead of the original module.

Currently, openpyxl detects, and uses defusedxml, if installed.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-05-16 08:48:38 -03:00
Val Kulkov
0dd445a248 python-curl: remove hardcoded dependency on mbedtls
Fixes issue #8978. If libcurl's SSL library is set to an SSL
library other than libmbedtls, compilation fails. This patch
configures python-curl to use the currently selected SSL library
for libcurl.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
2019-05-14 01:47:09 -04:00
Jeffery To
afeb7e8a78 python-pyasn1-modules: Update to 0.2.5
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-05-13 20:44:20 +08:00
Josef Schlehofer
5d2eb58aa3 Merge pull request #8807 from BKPepe/requests
python-requests: allow urllib3 1.25.x
2019-05-13 10:42:49 +02:00
Rosen Penev
61cfd69327 Merge pull request #8933 from commodo/readme-ext-feeds
lang/python/README.md: add note about use in other packages feeds
2019-05-11 12:29:32 -07:00
Daniel Golle
8849bf6fa4 Werkzeug: update to version 0.15.2
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-05-10 23:36:49 +02:00
Yousong Zhou
bb7893ed72 python-packages: strip quotes around index-url
With pip3.7, `--index-url ""` is different from absence of --index-url
argument.  Apply the same for python3 variant

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2019-05-10 16:49:51 +08:00
Yousong Zhou
ac66e2329d python3-packages: port from python-packages
This is largely done by suffixing "python" or "py" with "3".  The
README.md file is also copied here and we intend to maintain it
independently from its python2 counterpart.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2019-05-10 16:49:51 +08:00
Josef Schlehofer
8e04393a11 python-requests: polishing Makefile
Add PKG_CPE_ID, PKG_LICENSE_FILES
Reorder things in Makefile
Update URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-05-08 19:42:21 +02:00