Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Update required Python version to 3.6+ (!1879)

Browse source 
We need Python 3.5+ for recursive (**) globs.
While we are at it, we might as well require Python 3.6
so we can use f-strings in the future.
This commit is contained in:
Minecrell 2020-03-07 12:04:27 +01:00 • committed by Oliver Smith
parent 5f6b8eaf0e
commit 527f5a9512
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -12,7 +12,7 @@ Package build scripts live in the [`pmaports`](https://gitlab.com/postmarketOS/p
* Kernels based on the grsec patchset [do **not** work](https://github.com/postmarketOS/pmbootstrap/issues/107) *(Alpine: use linux-vanilla instead of linux-hardened, Arch: linux-hardened [is not based on grsec](https://www.reddit.com/r/archlinux/comments/68b2jn/linuxhardened_in_community_repo_a_grsecurity/))* * Kernels based on the grsec patchset [do **not** work](https://github.com/postmarketOS/pmbootstrap/issues/107) *(Alpine: use linux-vanilla instead of linux-hardened, Arch: linux-hardened [is not based on grsec](https://www.reddit.com/r/archlinux/comments/68b2jn/linuxhardened_in_community_repo_a_grsecurity/))*
* On Alpine Linux only: `apk add coreutils procps` * On Alpine Linux only: `apk add coreutils procps`
* [Linux kernel 3.17 or higher](https://postmarketos.org/oldkernel) * [Linux kernel 3.17 or higher](https://postmarketos.org/oldkernel)
* Python 3.4+ * Python 3.6+
* OpenSSL * OpenSSL
* git * git

4
pmb/config/__init__.py
View file

@ -209,6 +209,8 @@ apkbuild_package_attributes = {
# Variables in APKBUILD files, that get parsed # Variables in APKBUILD files, that get parsed
apkbuild_attributes = { apkbuild_attributes = {
**apkbuild_package_attributes,
"arch": {"array": True}, "arch": {"array": True},
"depends_dev": {"array": True}, "depends_dev": {"array": True},
"makedepends": {"array": True}, "makedepends": {"array": True},
@ -240,8 +242,6 @@ apkbuild_attributes = {
"_commit": {}, "_commit": {},
"source": {"array": True}, "source": {"array": True},
} }
# **apkbuild_package_attributes above would be nicer, but requires Python 3.5+
apkbuild_attributes.update(apkbuild_package_attributes)
# Variables from deviceinfo. Reference: <https://postmarketos.org/deviceinfo> # Variables from deviceinfo. Reference: <https://postmarketos.org/deviceinfo>
deviceinfo_attributes = [ deviceinfo_attributes = [

6
setup.py
View file

@ -45,15 +45,15 @@ setup(
author_email='info@postmarketos.org', author_email='info@postmarketos.org',
url='https://www.postmarketos.org', url='https://www.postmarketos.org',
license='GPLv3', license='GPLv3',
python_requires='>=3.4', python_requires='>=3.6',
classifiers=[ classifiers=[
'Development Status :: 3 - Alpha', 'Development Status :: 3 - Alpha',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
], ],
keywords='postmarketos pmbootstrap', keywords='postmarketos pmbootstrap',
packages=find_packages(exclude=['aports', 'keys', 'test']), packages=find_packages(exclude=['aports', 'keys', 'test']),