Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wheel.mk: Redesign proposal #4951

Merged
merged 82 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
4c99238
wheel.mk: Redesign proposal based on @hgy59 feedbacks
th0ma7 Nov 3, 2021
2a08f15
native/python310: Downgrade crossenv 1.0 to fix missing pip
th0ma7 Nov 3, 2021
5a0b61d
wheel.mk: Allow passing prefix to wheel=x.y in WHEELS variable
th0ma7 Nov 3, 2021
c6770b9
python310: Add wheel=x.y to WHEELS variable to showcase
th0ma7 Nov 3, 2021
a602685
wheel.mk: Adjust identation
th0ma7 Nov 3, 2021
df7695c
native/python310: Revert back to crossenv==1.1.4
th0ma7 Nov 3, 2021
6bf415f
cross/wheels*: Update pip and setuptools to latest versions
th0ma7 Nov 3, 2021
8f1c44c
native/python310: Revert back to crossenv==1.1.4
th0ma7 Nov 3, 2021
3247d18
wheel.mk: Allow using requirements-pure|cross.txt files
th0ma7 Nov 3, 2021
fbe123f
wheel.mk: Enfore pure|cross on dedicated files
th0ma7 Nov 3, 2021
c2211d0
python310: Add poetry and remote pure: to use default behavior
th0ma7 Nov 3, 2021
af2a7e8
python310: Add regex and netifaces
th0ma7 Nov 4, 2021
c139169
pillow: Downgrading to 8.2.0 per @hgy59 request
th0ma7 Nov 9, 2021
49a7a94
beets: Update to python310
th0ma7 Nov 9, 2021
105e1c5
tvheadend: Migrate to python310
th0ma7 Nov 9, 2021
e96d687
python310: Update requirements using cross as default
th0ma7 Nov 9, 2021
f487879
python310: Remove temporary examples in WHEELS definition
th0ma7 Nov 9, 2021
3d08330
wheel.mk: Fix cross-compiling (based on @publicarray finding)
th0ma7 Nov 9, 2021
d898215
python3(legacy): Align pip and setuptools with python310
th0ma7 Nov 9, 2021
642c08d
octoprint: Update to python310
th0ma7 Nov 9, 2021
0d77873
sickchill: Update to python310
th0ma7 Nov 9, 2021
e179c84
tvheadend: Remove python virtualenv as all wheels in python310
th0ma7 Nov 9, 2021
b5b6f22
octoprint: Migrate service-setup to use python310
th0ma7 Nov 9, 2021
fdc4789
sickchill: Update service-setup to use python310
th0ma7 Nov 9, 2021
da03a7e
beets: Update service-setup to use python310
th0ma7 Nov 9, 2021
3eb9378
flexget: Migrate to python310
th0ma7 Nov 9, 2021
4559ca3
python3: Adjust requirements.txt
th0ma7 Nov 9, 2021
c1b4cab
python38: Adjust requirements
th0ma7 Nov 9, 2021
1550f24
sabnzbd: Update to python 3.10
th0ma7 Nov 9, 2021
a1ac757
download.mk: Temporary add --no-certificate-check to wget for yasm
th0ma7 Nov 9, 2021
c44391d
beets: Update native pip path for python310
th0ma7 Nov 9, 2021
f1f4154
duplicity: Migrate to python 3.10
th0ma7 Nov 9, 2021
dd76787
borgbackup: Migrate to python 3.10
th0ma7 Nov 9, 2021
7891ef1
deluge: Adjust requirements to latest changes
th0ma7 Nov 10, 2021
a1e21b7
python310: Add poetry to crossenv - e.g. ONE FIX TO RULE THEM ALL
th0ma7 Nov 10, 2021
542e449
python310: Rework requirements with poetry now in crossenv
th0ma7 Nov 10, 2021
a2537a9
sickchill: All wheels are now cross thnx to poetry in crossenv
th0ma7 Nov 10, 2021
1be9c71
python310: Move basic wheels from WHEELS to requirements.txt
th0ma7 Nov 10, 2021
b4264b7
octoprint: Migrate pure to cross wheels using poetry
th0ma7 Nov 10, 2021
dddff5f
sabnzbd: Migrate additional pure to cross wheels due to poetry
th0ma7 Nov 10, 2021
e4fff26
flexget: Migrate pure to cross requirements due to poetry
th0ma7 Nov 10, 2021
b066cf7
rdiff-backup: Migrate to python310
th0ma7 Nov 10, 2021
ab2b5c0
python3: Align with findings from python310
th0ma7 Nov 10, 2021
0f3efa1
python38: Align with findings from python310
th0ma7 Nov 10, 2021
5954f5f
mercurial: Migrate to python310
th0ma7 Nov 10, 2021
0e4017c
ffsync: Merge back into a single requirement.txt file
th0ma7 Nov 10, 2021
166d4eb
beets: Fix build issue with python-mdp2
th0ma7 Nov 10, 2021
fdea2dd
tvheadend: Revert changes to stop building ffmpeg (ref: #4965)
th0ma7 Nov 11, 2021
a84986e
python310: Allow building wheels with limited API (abi3 prefix)
th0ma7 Nov 11, 2021
962f70c
python310: pycrypto is no longer maintained
th0ma7 Nov 11, 2021
c2755ec
wheel.mk: Manage arch specific file prefixes
th0ma7 Nov 12, 2021
06c7ea4
pillow: Re-updating to version 8.4.0 per @hgy59 request
th0ma7 Nov 12, 2021
bdcb9e0
download.mk: Remove temporary no-certificate-check
th0ma7 Nov 12, 2021
4439e07
wheel.mk: Fix naming for ARMv5 88f6281 as armv5tel
th0ma7 Nov 12, 2021
1fdc0f9
wheel.mk: Only support requirement files in WHEELS variable
th0ma7 Nov 12, 2021
bd9b690
borgbackup: Use cross & pure requirement files
th0ma7 Nov 12, 2021
5777762
duplicity: Use cross & pure requirement files
th0ma7 Nov 12, 2021
6bcc519
flexget: Use cross & pure requirement files
th0ma7 Nov 12, 2021
1174bdd
octoprint: requirement.txt entirely managed through cross-compiled
th0ma7 Nov 12, 2021
73f4d2a
python38: Use cross & pure requirement files
th0ma7 Nov 12, 2021
fdc198e
python3: Use cross & pure requirement files
th0ma7 Nov 12, 2021
981f73b
sabnzbd: Use cross & pure requirement files
th0ma7 Nov 12, 2021
b167fb8
python310: Remove forgotten pure wheels from cross requirement
th0ma7 Nov 12, 2021
994ac65
sickchill: Bump package version for python 3.10 migration
th0ma7 Nov 17, 2021
84f197a
python310: Remove cryptography from abi3 (and keep in cross)
th0ma7 Nov 18, 2021
ffc8208
homeassistant: Rough 1st pass to migrate to python310
th0ma7 Nov 18, 2021
2b60bf1
Update cython & numpy to latest version to fix x86_64 builds
th0ma7 Nov 19, 2021
302279f
python310: Add pycares
th0ma7 Nov 20, 2021
11ac223
homeassistant: Misc cleanups
th0ma7 Nov 20, 2021
eb1021f
homeassistant: Now fully functional with Python 3.10
th0ma7 Nov 22, 2021
e47e012
sickchill: Fix typo
th0ma7 Nov 22, 2021
514a5d6
sabnzbd: pytz wheel already provided by python310
th0ma7 Nov 22, 2021
03bac2d
sickchill: BUILD_DEPENDS to python310
th0ma7 Nov 22, 2021
626eee0
octoprint: Small adjustments to get clean install using python310
th0ma7 Nov 22, 2021
219f7f9
flexget: Disable python310 default wheels
th0ma7 Nov 22, 2021
980005e
beets: Now compatible with python310 with update to 1.5.0
th0ma7 Nov 23, 2021
de266f6
borgbackup: Misc fixes for python310 compatibility
th0ma7 Nov 23, 2021
e2dc86d
duplicity: Misc fixes for python310 compabitility
th0ma7 Nov 23, 2021
169b3e0
duplicity: Disable future wheel as already in python310
th0ma7 Nov 23, 2021
97e841b
znc: Migrate to Python 3.10
th0ma7 Nov 23, 2021
578e88f
python-wheel.mk: Rename using PYTHON_ARCH instead of none-any.whl
th0ma7 Nov 24, 2021
08b04ab
Rename requirements-cross.txt to requirements-crossenv.txt
th0ma7 Nov 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross/dtlssocket/PLIST
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rsc:bin/wheel

17 changes: 0 additions & 17 deletions cross/homeassistant.pillow/Makefile

This file was deleted.

Empty file removed cross/homeassistant.pillow/PLIST
Empty file.
3 changes: 0 additions & 3 deletions cross/homeassistant.pillow/digests

This file was deleted.

40 changes: 0 additions & 40 deletions cross/homeassistant.pillow/patches/001-fix-paths.patch

This file was deleted.

2 changes: 1 addition & 1 deletion cross/pillow/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = Pillow
PKG_VERS = 8.4.0
PKG_VERS = 8.2.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/P/$(PKG_NAME)
Expand Down
6 changes: 3 additions & 3 deletions cross/pillow/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Pillow-8.4.0.tar.gz SHA1 ca8d057aec64ccd0804044bc71c17921afbe2e4e
Pillow-8.4.0.tar.gz SHA256 b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed
Pillow-8.4.0.tar.gz MD5 7a1eb5a250c7ccbd549a89e16404f09f
Pillow-8.2.0.tar.gz SHA1 a9b32caf6ff1d5160ad41265c7ad3b090114eefc
Pillow-8.2.0.tar.gz SHA256 a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1
Pillow-8.2.0.tar.gz MD5 21c03274a9f59b9c00419852a8faebe7
1 change: 0 additions & 1 deletion spk/homeassistant/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ SPK_DEPENDS = "python310"
BUILD_DEPENDS = cross/python310

DEPENDS += cross/gevent
DEPENDS += cross/homeassistant.pillow
# for iqvia
DEPENDS += cross/numpy
# for python-libnmap
Expand Down
4 changes: 2 additions & 2 deletions spk/homeassistant/src/postinst_components_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ authcaptureproxy==1.0.2
authlib==0.15.4
axis==44
backoff==1.11.1
beautifulsoup4==4.9.3
#beautifulsoup4==4.9.3 ==> python310
bellows==0.27.0
bidict==0.21.2
bimmer-connected==0.7.20
Expand Down Expand Up @@ -146,7 +146,7 @@ stringcase==1.2.0
tenacity==8.0.1
teslajsonpy==0.18.3
typing-inspect==0.7.1
tzlocal==3.0
#tzlocal==3.0 ==> python310
WSDiscovery==2.0.0
xmltodict==0.12.0
yalexs==1.1.13
Expand Down
20 changes: 10 additions & 10 deletions spk/homeassistant/src/postinst_default_config_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ awesomeversion==21.4.0
### bcrypt==3.1.7
boto3==1.18.18
botocore==1.21.18
certifi==2021.5.30
#certifi==2021.5.30 ==> python310
### cffi==1.14.1
chardet==4.0.0
### ciso8601 @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/ciso8601-2.1.3-cp38-none-any.whl
click==7.1.2
#click==7.1.2 ==> python310
### cryptography @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/cryptography-3.3.2-cp38-none-any.whl
deepmerge==0.3.0
defusedxml==0.7.1
Expand All @@ -37,9 +37,9 @@ home-assistant-frontend==20210830.0
homeassistant==2021.9.7
httpcore==0.13.6
httpx==0.19.0
idna==2.9
#idna==2.9 ==> python310
ifaddr==0.1.7
Jinja2==3.0.1
#Jinja2==3.0.1 ==> python310
jmespath==0.10.0
jose==1.0.0
josepy==1.8.0
Expand All @@ -53,14 +53,14 @@ ply==3.11
py-synologydsm-api==1.0.4
pyasn1==0.4.8
pycognito==2021.3.1
pycparser==2.19
#pycparser==2.19 ==> python310
### pycrypto==2.6.1
### pycryptodomex @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/pycryptodomex-3.10.1-cp35-abi3-linux_aarch64.whl
pyipp==0.11.0
### PyJWT @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/PyJWT-1.7.1-py2.py3-none-any.whl
PyMetno==0.8.3
### PyNaCl @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/PyNaCl-1.4.0-cp38-cp38-linux_aarch64.whl
pyOpenSSL==20.0.1
#pyOpenSSL==20.0.1 ==> python310
pyotp==2.3.0
PyQRCode==1.2.1
pyRFC3339==1.1
Expand All @@ -80,10 +80,10 @@ python-jose==3.2.0
python-miio==0.5.8
python-slugify==4.0.1
PythonDNS==0.1
pytz==2021.1
#pytz==2021.1 ==> python310
### PyYAML @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/PyYAML-5.4.1-cp38-cp38-linux_aarch64.whl
pyudev==0.22.0
requests==2.25.1
#requests==2.25.1 ==> python310
requests-toolbelt==0.9.1
rfc3986==1.5.0
rsa==4.7.2
Expand All @@ -97,8 +97,8 @@ spotipy==2.18.0
### SQLAlchemy @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/SQLAlchemy-1.4.23-cp38-cp38-linux_aarch64.whl
text-unidecode==1.3
typing-extensions==3.10.0.0
Unidecode==1.2.0
urllib3==1.26.6
#Unidecode==1.2.0 ==> python310
#urllib3==1.26.6 ==> python310
voluptuous==0.12.1
voluptuous-serialize==2.4.0
### yarl @ file:///volume1/%40appstore/homeassistant/share/wheelhouse/yarl-1.6.3-cp38-cp38-linux_aarch64.whl
Expand Down
2 changes: 1 addition & 1 deletion spk/homeassistant/src/requirements-cross.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ciso8601==2.1.3
# httpx==0.19.0
# jinja2==3.0.1 # fails to build, moved to postinst_default_config_requirements.txt
# numpy==1.21.4 # requires to be built as cross/numpy
# PyJWT==1.7.1 ==> python310
PyJWT==1.7.1
# PyNaCl ==> python310 # for mobile_app
## pip>=8.0.3,<20.3
# python-slugify==4.0.1
Expand Down
4 changes: 2 additions & 2 deletions spk/python310/src/requirements-cross.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ipaddress==1.0.23
itsdangerous==2.0.1
Jinja2==3.0.2
lxml==4.6.3
markupsafe==2.0.1
MarkupSafe==2.0.1
msgpack-python==0.5.6
netifaces==0.11.0
olefile==0.46
Expand All @@ -38,7 +38,7 @@ pyasn1==0.4.8
pycares==4.1.2
pycparser==2.20
pycurl==7.44.1
PyJWT==2.3.0
#PyJWT==2.3.0 ==> some packages needs version < 2.0
PyNaCl==1.4.0
pyOpenSSL==21.0.0
pyparsing==3.0.1
Expand Down
2 changes: 1 addition & 1 deletion spk/sickchill/src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ putio.py==8.7.0
pyaes==1.6.1
pygithub==1.55
pyjsparser==2.7.1
pyjwt==2.3.0
PyJWT==2.3.0
pymediainfo==5.1.0
#PyNaCl==1.4.0 ==> python310
pynma==1.0
Expand Down