Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 04:58:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1692383 - Upgrade python-zstandard to 0.15.1. r=firefox-build-system-reviewers,mhentges

Browse Source 
As far as I can tell, we don't use zstandard from python2. As the last
version supporting python2 is 0.14.1, drop installing the python2
version.

Differential Revision: https://phabricator.services.mozilla.com/D105075
This commit is contained in:
Mike Hommey 2021-02-17 00:53:38 +00:00
parent 2b6f6c8116
commit b6d915dd07
12 changed files with 186 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
build/debian-packages/python-zstandard-buster.diff Normal file
View File

@ -0,0 +1,61 @@
diff --git a/debian/changelog b/debian/changelog
index 84028db..d6c86c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-zstandard (0.15.1-1.deb10moz1) buster; urgency=low
+
+ * Mozilla backport for buster.
+ * Apply https://github.com/indygreg/python-zstandard/pull/139.
+
+ -- Mike Hommey <glandium@mozilla.com> Fri, 12 Feb 2021 13:22:31 +0900
+
python-zstandard (0.15.0~dev0-1) unstable; urgency=low
* New version.
diff --git a/debian/control b/debian/control
index 1835727..f8a1a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,9 @@ Priority: optional
Build-Depends:
debhelper (>= 7),
dh-python,
- python-all-dev,
python3-all-dev,
- python-hypothesis,
python3-hypothesis,
- python-pytest,
python3-pytest,
- python-setuptools,
python3-setuptools
Standards-Version: 3.9.1
X-Python3-Version: >= 3.5
@@ -19,17 +14,6 @@ Homepage: https://github.com/indygreg/python-zstandard
Vcs-Browser: https://github.com/indygreg/python-zstandard.git
Vcs-Git: https://github.com/indygreg/python-zstandard.git
-Package: python-zstandard
-Architecture: any
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Provides:
- ${python:Provides}
-Description: Zstandard bindings for Python
- Python bindings to zstandard compression library.
-
Package: python3-zstandard
Architecture: any
Depends:
diff --git a/debian/rules b/debian/rules
index 751826f..3a2c1b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export PYBUILD_NAME=zstandard
export PYBUILD_TEST_ARGS=-I fuzzing
%:
- dh $@ --parallel --with python2,python3 --buildsystem=pybuild
+ dh $@ --parallel --with python3 --buildsystem=pybuild

56
build/debian-packages/python-zstandard-jessie.diff
View File

@ -2,26 +2,60 @@ diff --git a/debian/changelog b/debian/changelog
index 84028db..d6c86c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-zstandard (0.11.1-1.deb8moz1) jessie; urgency=low
@@ -1,3 +1,10 @@
+python-zstandard (0.15.1-1.deb8moz1) jessie; urgency=low
+
+ * Remove build dependencies so package builds on jessie.
+ * Apply https://github.com/indygreg/python-zstandard/pull/139.
+
+ -- Mike Hommey <glandium@mozilla.com> Thu, 25 Jul 2019 14:43:17 +0900
+ -- Mike Hommey <glandium@mozilla.com> Fri, 12 Feb 2021 13:22:31 +0900
+
python-zstandard (0.9.1-1) unstable; urgency=low
python-zstandard (0.15.0~dev0-1) unstable; urgency=low
* Initial Debian packaging definition.
* New version.
diff --git a/debian/control b/debian/control
index 43bbd46..720082f 100644
index 1835727..f8a1a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,6 @@ Build-Depends:
@@ -5,13 +5,8 @@ Priority: optional
Build-Depends:
debhelper (>= 7),
dh-python,
python-all-dev,
- python-all-dev,
python3-all-dev,
- python-hypothesis,
- python3-hypothesis,
python-nose,
python3-nose,
python-setuptools,
- python-pytest,
python3-pytest,
- python-setuptools,
python3-setuptools
Standards-Version: 3.9.1
X-Python3-Version: >= 3.5
@@ -19,17 +14,6 @@ Homepage: https://github.com/indygreg/python-zstandard
Vcs-Browser: https://github.com/indygreg/python-zstandard.git
Vcs-Git: https://github.com/indygreg/python-zstandard.git
-Package: python-zstandard
-Architecture: any
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Provides:
- ${python:Provides}
-Description: Zstandard bindings for Python
- Python bindings to zstandard compression library.
-
Package: python3-zstandard
Architecture: any
Depends:
diff --git a/debian/rules b/debian/rules
index 751826f..3a2c1b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@ export PYBUILD_NAME=zstandard
export PYBUILD_TEST_ARGS=-I fuzzing
%:
- dh $@ --parallel --with python2,python3 --buildsystem=pybuild
+ dh $@ --parallel --with python3 --buildsystem=pybuild

2
build/zstandard_requirements.in
View File

@ -1,2 +1,2 @@
zstandard==0.13.0
zstandard==0.15.1

142
build/zstandard_requirements.txt
View File

@ -2,97 +2,53 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --generate-hashes --output-file=zstandard_requirements.txt zstandard_requirements.in
# pip-compile --generate-hashes --output-file=build/zstandard_requirements.txt build/zstandard_requirements.in
#
cffi==1.14.4 \
--hash=sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e \
--hash=sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d \
--hash=sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a \
--hash=sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec \
--hash=sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362 \
--hash=sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668 \
--hash=sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c \
--hash=sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b \
--hash=sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06 \
--hash=sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698 \
--hash=sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2 \
--hash=sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c \
--hash=sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7 \
--hash=sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009 \
--hash=sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03 \
--hash=sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b \
--hash=sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909 \
--hash=sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53 \
--hash=sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35 \
--hash=sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26 \
--hash=sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b \
--hash=sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01 \
--hash=sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb \
--hash=sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293 \
--hash=sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd \
--hash=sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d \
--hash=sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3 \
--hash=sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d \
--hash=sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e \
--hash=sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca \
--hash=sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d \
--hash=sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775 \
--hash=sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375 \
--hash=sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b \
--hash=sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b \
--hash=sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f \
# via zstandard
pycparser==2.20 \
--hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
--hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 \
# via cffi
zstandard==0.13.0 \
--hash=sha256:0097740f6efef248d05f2d772fc4e75f282be9d599cd2b57f9349ad74c8579a9 \
--hash=sha256:10fcf9fb35ed91c0fc7463974fcbfb696a831b151d6552fbd9bc870a1fd45601 \
--hash=sha256:22daffeeab53105ed65bb2be9133f857617ae432415fe4d7b48976e38b14767b \
--hash=sha256:2866e623ae1288d0c1f37477dd6635a3526439a615caac7718ca65ad0a17aedc \
--hash=sha256:2a530a0aa03e979349a821f1cfa93e6ad006a02ac25e2f55ed9657a46c8a993a \
--hash=sha256:2c77185a4cefe3774ef4de4bcbf477c6e5f7d106e6d0e0f9d97c8c8d85a7a7ce \
--hash=sha256:2f3734428a65da36c82137daab5b3458d2e65f472315c4bd07996396309209a7 \
--hash=sha256:3b08d5091615172804d261cc5629933de7252e479776e8acf42eb9d90d305003 \
--hash=sha256:3ba348e22e9f0053454e6cd178806f6f5aaa2bc9a6a9f14c99107934d8825f97 \
--hash=sha256:45f55338d1bc667823c78ae00036e1a4a28f96308abbd4a38c708a6876e58346 \
--hash=sha256:5168161bad3ad4bfa3a9ac4cda168eec3eb5da640ef17d7d6c21f903d87dec51 \
--hash=sha256:51d93f9fe4207424394f34b3793e274e50376c0e602a170fc8ec546213805446 \
--hash=sha256:5d58b1a322312585b58aaa4c21f822be3e926fd4ce81f940b8dd4b873f000fa5 \
--hash=sha256:5f303002cbf57e8ad1f18e5c23741d1ad5aa09ac2247c430a5843b93936e101f \
--hash=sha256:64c162416941e1c0bd449bf551bf255a0ca73d77c56796c5a2eef2249c489cd8 \
--hash=sha256:77cd06c48cb9b5b96ac9d95f1de0a6d0c41d8e45cfdd8a76dac7a0ea1c9fa8c8 \
--hash=sha256:7a6af45c49b374b39434d15e1cf8659733e611ddddf85ca4e018b597309ac0b9 \
--hash=sha256:7af5837883020426e644ca8c3301e5398b46cb63eaaccf7405e574fd54f2c985 \
--hash=sha256:7b75d91ed097e2e7b1fb60b314fd23e7dbec8b608da529d1df960e25e6b43349 \
--hash=sha256:7db22006ea2ec0f97db51aeb1384f473cbf4d0f7974eff442d86ef9aa628a1eb \
--hash=sha256:853df35231ac662e8ab7154eb026fc9ed0bc9f6d52734d0d70975cfb1ac95b3f \
--hash=sha256:887861d2b6d926cef887f89f0d3d4d894ad75a12de1f2b41f15e00ac0a629230 \
--hash=sha256:95e340e75891baf60e0c27f6bd3dcf9f2c72193bc04f953aaf7dfa7f76dadbb3 \
--hash=sha256:984c12896fef610c023184e2185a011cac207530620f9bc7444983492942def3 \
--hash=sha256:ab15c02af232325b2dfedb325a05e49717157f1243c47698046fe476e4111182 \
--hash=sha256:b1f52f5cc60cd4b843bc7f0879e50796cb952381bae08101de07797b9d8c76a4 \
--hash=sha256:b2c9717906a84dbd907fe648ede2add4c6d3eb73e1dff9fdd3046b8645a2679a \
--hash=sha256:b3b174f91f187563f64f912974a3554af494200dc2076329d638a3e12e333667 \
--hash=sha256:b3e9b81e64de6a284ad8b55ab4d97a8c6c945e689d46b4c967889c3399104694 \
--hash=sha256:b42860c8722c32e67731bf8b8fefc0f152eeebd461f7273ef53fae04ca19fbd0 \
--hash=sha256:b44afaffcce80248cd9783a827a4510b0c6ebe1fee84e39c4ca0d3893f881865 \
--hash=sha256:b53622c0a2b3044d911f307a92ca1872c0d16db03475a3f907056ce03905e298 \
--hash=sha256:c010ce893c92ed7a857427a50c2aba389a64dfae9956cf990aec1ac00221f5d6 \
--hash=sha256:c344c96679aa2d60be01d518b0132d1ea67aee511a9e0170cff6a8a8ba1032db \
--hash=sha256:c4bbd70ab4a19d174596c7a936d87bfd279ad8de0a818aa9f4ec42394b937f11 \
--hash=sha256:c5261e2e7e678f95bab398b389009e62cf531a5d06d3ae188cd5c134d9d79823 \
--hash=sha256:c72a839e9df34484212b722534e93f0688264435ae87e7c25dffab699b880c1f \
--hash=sha256:dd81cc69616e515984b8fc18bba73b0fb37e5600b3740eb835c6218445c1fa80 \
--hash=sha256:ddb3eb9ca4c6b58d28ce028316e99ac9ff312bbff6399a33cd856fea2478664d \
--hash=sha256:df5d0c97bb13898bde0c56e87faa1ff9c37108997f904cbd5d44cd62362ff8e5 \
--hash=sha256:e32f2f8d50209a72522e4e1b5ad350d311a9070bd1ee5ce978c1270e77214b9a \
--hash=sha256:e3c5e65b9a157e72129c6a57e2bbbc47091823bb4ab83b41f05ff47ea1608dbb \
--hash=sha256:e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561 \
--hash=sha256:e5f6659c862f55d048bcd0e772bbfe80f3d69c731999308996c6f90daf98b770 \
--hash=sha256:ea91080068f7491ee80d46d8b90ebc86b9794383645e974cb8c2d559fe215c00 \
--hash=sha256:f1e64e1baea6bcaedc6df458f31fa79ffd2745999cc919862253d52e2eb67166 \
--hash=sha256:f3fae7b31bc04cb09ca182d4c15ebe5caa65cd96b3be573e2d80140237c96780 \
--hash=sha256:f4ec6aa8dca1d12fd190d42c7e5e8da860a38a344713d4f1994c4617dec52891 \
# via -r zstandard_requirements.in
zstandard==0.15.1 \
--hash=sha256:03c0b012d910c9a78ac046520ebd7b7cd6fe7b93cd4ec3f49b8f0ac39d57d465 \
--hash=sha256:0fa280d2edd1dd8b61aa5ce46d023d32d31fa05b98070a5b98e7fd4d878bae1d \
--hash=sha256:1b8c4c304e694c0664071fb958f0ea7fb9d2ddd008f1f5b4006235910b6eaaed \
--hash=sha256:229530dc3d79b114740f4394ffe94c2ecbd3bbadb20696a9cbbf07f65094dcf3 \
--hash=sha256:326c3cd8a2a87e92dccb0613110922a6fe4bc86e226854943806cf66203fde9f \
--hash=sha256:34bc6bd46cd65f90f018b1f684b027e34841993ab91b951b3385d4a6ea2d8772 \
--hash=sha256:3691de9c2583ab5b43d91dd39b6575dbe0ef3314b676459522413817104b1278 \
--hash=sha256:3b466c146dbe9bb1f2d2c9beccda631f112d93e5ac226388545acdf0325bd213 \
--hash=sha256:4c82f430af910dba1b0e0e5e4b67a74c222703b3575fe1ac268c8257626c0729 \
--hash=sha256:4d7a72f6fe882c5c768602739ad5ae74dbf115bca5ec2ed1012a7986d190658c \
--hash=sha256:53e6dac24fabee67ced260fe62d5cf886be92308cbda4d4e217a3a29341f83da \
--hash=sha256:5418e2279a47802886241891fcd82b946dc176e1384c00efe87b32f7d633b879 \
--hash=sha256:5aa171eaa420e11dd32e327f0231fc7a7cd00c3fad5cbd11f27844827b82317d \
--hash=sha256:637d513e0ca84375516b9f5af6f4f0020381200c77e8c43d21fca7f66848e9b7 \
--hash=sha256:6c09eb0c302b42939f9b3db9cec7d92e2292fc54f13c680ca6c429634ebaaf46 \
--hash=sha256:72af53b92990ba6118d5dabe8a777cdd36d9fb88d9bf665b84517d0efdcc6f8f \
--hash=sha256:74a7461dbc8a28d5b9754c56f7748aa4bb25a591b166213dbfa99312f5d45814 \
--hash=sha256:756f751ca4c0ac8bc7696d2820e14529f00d284358fa2150b4ce57b1a6e16ad3 \
--hash=sha256:794517afee12005be1038a0b196c9e4e03409fb2f23e218c11393c6ac658eb5f \
--hash=sha256:7bc73d3802145ba40677e8fa8185a0c6848b8e582be3d7d7e5132049cd112307 \
--hash=sha256:7dadb8bd028bd04b1734734227a06a48f64704a6df82be144376db03be95829c \
--hash=sha256:83d84fe875c28f98b574fb7d4ec4e5a41e7cdfeb53b177641eb25afdb93b95cd \
--hash=sha256:8de12b37d32a9128a72b6050d4c6070a3bc944557f6b9912ecfc421f9ee97824 \
--hash=sha256:92ea1c604ec49f3e4ffcbbcfeadc96ebc48bc2edc5f0cb5e03e9c1204ed91869 \
--hash=sha256:945a49c8e7dbfd28e31eeb8b21d2343370ac75d6ec1c79412a3f9bb4c54c5f13 \
--hash=sha256:95b682d98086c395e1d8c741a414a4fc8bf7c41254aaa85c8613551fd3ede78c \
--hash=sha256:993ce06458283a6c55ed93b862f7fa22b9c27b855f04c98c25f207a7687056cd \
--hash=sha256:9d9ab430027e3e04a7d4f13f7af693b80cceb728ff25f2e7a16f19851fa0fe3e \
--hash=sha256:9de5c54e34c845c70c18561afd106cf754b41e009a4fc4131bfed537abc1468d \
--hash=sha256:9e4c5bfcb232491777546265aba9c30c532edcf93f4d16705402732417f81d18 \
--hash=sha256:a95e0ba90c0a7f7f6e37e1b730b218e31775777b28630e5ebc05c10b4ee1946e \
--hash=sha256:a9f8297180e1f291418524345055c9b2dea9b3ca5db3f72b27e3dac67453a361 \
--hash=sha256:b223633865725c5c3840ba25a7e71abdc7bb8113be6dd88fb88d46ebe7280df9 \
--hash=sha256:bea22653bf7242320f9cca1c68f8e381134bee8b2c8f36823085b7e398fad11a \
--hash=sha256:cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f \
--hash=sha256:d2c3a460291ee042057a2dfe962b018a3e49cc0ec83efdfa6a714dcbc4d4b351 \
--hash=sha256:d308f44ca292c0eb117703ee43b995de77c3d3bf99c90b4c6c74e75a10f62eea \
--hash=sha256:db4b9d491fd9ac6b52cc4640da0c8e7b957d1cd80901be30e8be9a470b242d99 \
--hash=sha256:e0940e9bd36c2d84afd5bd0c45a9c6db3aa8956c080bf7df65b3220a23449360 \
--hash=sha256:e722ae77e072c26b69a3bca5a4d78d5f4927634f527d05a9057d9d58844053aa \
--hash=sha256:f12d97f388fc9bb238280641367f49612016d0353a99eff13b58588f60444263 \
--hash=sha256:f41d39dc81b0b5558891683267e15c36b43eb06571a5fed7da1e0e2663623d9b \
--hash=sha256:f81e2d909327927f7afff2f9961234d4747a163091ad8077edf621a2e128bf80 \
--hash=sha256:f8905bc741dcec0f6a74445fbfadc032772daca4a908dad7d43e8d65ae1fd3f4 \
--hash=sha256:fc28f71d935f65c70b20f649ec8db572cdbdeff35528f3b922d7ae50e9c5f9a9 \
--hash=sha256:ff7642a936734781708ece0721c58b238759be4c473f1855d50515a0fa10a5a2
# via -r build/zstandard_requirements.in

8
python/mozbuild/mozbuild/mach_commands.py
View File

@ -2114,10 +2114,6 @@ class CreateMachEnvironment(MachCommandBase):
else:
manager.build(sys.executable)
manager.install_pip_requirements(
os.path.join(self.topsrcdir, "build", "zstandard_requirements.txt")
)
try:
# `mach` can handle it perfectly fine if `psutil` is missing, so
# there's no reason to freak out in this case.
@ -2131,6 +2127,10 @@ class CreateMachEnvironment(MachCommandBase):
)
if not PY2:
manager.install_pip_requirements(
os.path.join(self.topsrcdir, "build", "zstandard_requirements.txt")
)
# This can fail on some platforms. See
# https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
try:

1
taskcluster/ci/docker-image/kind.yml
View File

@ -61,6 +61,7 @@ jobs:
- deb8-mercurial
- deb8-python3.6
- deb8-python3-defaults
- deb8-python-cffi
- deb8-python-psutil
- deb8-python-zstandard
- deb8-xz-utils

24
taskcluster/ci/packages/kind.yml
View File

@ -193,6 +193,20 @@ jobs:
sha256: 9727dcb3d6b655e4f2a92110f5db076a490aa50b739804be239905ecff3aacc8
patch: gdb-jessie.diff
deb8-python-cffi:
description: "python-cffi rebuild for python 3.6 in Debian jessie"
treeherder:
symbol: Deb8(python-cffi)
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20140724T163954Z/pool/main/p/python-cffi/python-cffi_0.8.6-1.dsc
sha256: 26fc10c5f58dd0d9aa2ea3ec079a33a2591bac53493ec032b3f1bca68aa1f343
packages:
- deb8-dh-python
- deb8-python3.6
- deb8-python3-defaults
deb8-python-psutil:
description: "python-psutil rebuild for python 3.6 in Debian jessie"
treeherder:
@ -214,8 +228,8 @@ jobs:
run:
using: debian-package
tarball:
url: https://github.com/indygreg/python-zstandard/archive/0.11.1.tar.gz
sha256: 2df90698e22f0da49cdd360438479f363e58eb8c3ac6e8bac84d831cf8e7baf4
url: https://github.com/indygreg/python-zstandard/releases/download/0.15.1/zstandard-0.15.1.tar.gz
sha256: cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f
name: python-zstandard
patch: python-zstandard-jessie.diff
packages:
@ -231,10 +245,10 @@ jobs:
using: debian-package
dist: buster
tarball:
url: https://github.com/indygreg/python-zstandard/archive/0.11.1.tar.gz
sha256: 2df90698e22f0da49cdd360438479f363e58eb8c3ac6e8bac84d831cf8e7baf4
url: https://github.com/indygreg/python-zstandard/releases/download/0.15.1/zstandard-0.15.1.tar.gz
sha256: cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f
name: python-zstandard
pre-build-command: debchange -v 0.11.1-1.deb10moz --distribution buster "Mozilla backport for buster"
patch: python-zstandard-buster.diff
deb10-mmdebstrap:
# Only a more recent version of mmdebstrap than what is in buster has the

1
taskcluster/docker/debian-base/Dockerfile
View File

@ -41,7 +41,6 @@ RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAG
python3 \
python3-distutils-extra \
python3-minimal \
python-zstandard \
python3-zstandard \
python-psutil \
python3-psutil \

2
taskcluster/docker/lint/Dockerfile
View File

@ -24,6 +24,8 @@ ADD topsrcdir/taskcluster/docker/recipes/install-node.sh /build/install-node.sh
# %include taskcluster/docker/recipes/install-mercurial.sh
ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /build/install-mercurial.sh
ADD system-setup.sh /tmp/system-setup.sh
# %include build/zstandard_requirements.txt
ADD topsrcdir/build/zstandard_requirements.txt /build/zstandard_requirements.txt
# %include tools/lint/eslint/manifest.tt
ADD topsrcdir/tools/lint/eslint/manifest.tt /tmp/eslint.tt
# %include tools/lint/eslint/eslint-plugin-mozilla/manifest.tt

3
taskcluster/docker/lint/system-setup.sh
View File

@ -48,8 +48,7 @@ cd /build
###
# zstandard
###
pip install zstandard==0.13.0
pip3 install zstandard==0.13.0
pip3 install -r /build/zstandard_requirements.txt
###
# ESLint Setup

3
taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
View File

@ -16,8 +16,7 @@ pip install --upgrade pip==19.2.3
hash -r
pip install virtualenv==15.2.0
pip install zstandard==0.13.0
pip3 install zstandard==0.13.0
pip3 install -r /setup/zstandard_requirements.txt
pip install psutil==5.7.0
pip3 install psutil==5.7.0

2
taskcluster/docker/ubuntu1804-test/Dockerfile
View File

@ -48,6 +48,8 @@ ADD topsrcdir/taskcluster/scripts/misc/fetch-content /builds/worker/bin/fetch-co
ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /builds/worker/scripts/tooltool.py
# %include build/zstandard_requirements.txt
ADD topsrcdir/build/zstandard_requirements.txt /setup/zstandard_requirements.txt
# %include taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
ADD topsrcdir/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh /setup/system-setup.sh
RUN bash /setup/system-setup.sh