diff --git a/README.md b/README.md index 0a1f50fe..97b7bca2 100644 --- a/README.md +++ b/README.md @@ -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/))* * On Alpine Linux only: `apk add coreutils procps` * [Linux kernel 3.17 or higher](https://postmarketos.org/oldkernel) -* Python 3.4+ +* Python 3.6+ * OpenSSL * git diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index 9aeb100a..a0b75bd1 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -209,6 +209,8 @@ apkbuild_package_attributes = { # Variables in APKBUILD files, that get parsed apkbuild_attributes = { + **apkbuild_package_attributes, + "arch": {"array": True}, "depends_dev": {"array": True}, "makedepends": {"array": True}, @@ -240,8 +242,6 @@ apkbuild_attributes = { "_commit": {}, "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: deviceinfo_attributes = [ diff --git a/setup.py b/setup.py index ee897d50..60517df1 100755 --- a/setup.py +++ b/setup.py @@ -45,15 +45,15 @@ setup( author_email='info@postmarketos.org', url='https://www.postmarketos.org', license='GPLv3', - python_requires='>=3.4', + python_requires='>=3.6', classifiers=[ 'Development Status :: 3 - Alpha', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ], keywords='postmarketos pmbootstrap', packages=find_packages(exclude=['aports', 'keys', 'test']),