From 2f1ec582e91d8be45c80b039c212f4efc9d84ff7 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 17:53:12 +0000 Subject: [PATCH] Add constraints for python3.6 too --- .gitignore | 3 +- bin/update_constraints.py | 25 ++++----- .../resources/constraints-python27.txt | 19 ++++--- .../resources/constraints-python36.txt | 54 +++++++++++++++++++ 4 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 cibuildwheel/resources/constraints-python36.txt diff --git a/.gitignore b/.gitignore index fccca513..ed7b532f 100644 --- a/.gitignore +++ b/.gitignore @@ -89,8 +89,9 @@ venv3/ venv2/ ENV/ env/ -env3/ env2/ +env2?/ +env3/ env3?/ # Spyder project settings diff --git a/bin/update_constraints.py b/bin/update_constraints.py index 5ade3eb3..1080e030 100755 --- a/bin/update_constraints.py +++ b/bin/update_constraints.py @@ -18,22 +18,15 @@ subprocess.check_call([ '--upgrade', 'cibuildwheel/resources/constraints.in', ]) -subprocess.check_call([ - './env2/bin/pip-compile', - '--allow-unsafe', - '--generate-hashes', - '--upgrade', - 'cibuildwheel/resources/constraints.in', - '--output-file', 'cibuildwheel/resources/constraints-python27.txt' -]) -subprocess.check_call([ - './env35/bin/pip-compile', - '--allow-unsafe', - '--generate-hashes', - '--upgrade', - 'cibuildwheel/resources/constraints.in', - '--output-file', 'cibuildwheel/resources/constraints-python35.txt' -]) +for python_version in ['27', '35', '36']: + subprocess.check_call([ + f'./env{python_version}/bin/pip-compile', + '--allow-unsafe', + '--generate-hashes', + '--upgrade', + 'cibuildwheel/resources/constraints.in', + '--output-file', f'cibuildwheel/resources/constraints-python{python_version}.txt' + ]) Image = namedtuple('Image', [ 'manylinux_version', diff --git a/cibuildwheel/resources/constraints-python27.txt b/cibuildwheel/resources/constraints-python27.txt index aae60acc..ed7c3a69 100644 --- a/cibuildwheel/resources/constraints-python27.txt +++ b/cibuildwheel/resources/constraints-python27.txt @@ -15,9 +15,10 @@ configparser==4.0.2 \ contextlib2==0.6.0.post1 \ --hash=sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e \ --hash=sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b \ - # via importlib-metadata, importlib-resources, virtualenv, zipp + # via importlib-metadata, importlib-resources, virtualenv delocate==0.8.0 \ - --hash=sha256:ac9f4d8d28b2582d94f764db0d72a1fe3c42ab8212e9b780168455de385d5b95 + --hash=sha256:ac9f4d8d28b2582d94f764db0d72a1fe3c42ab8212e9b780168455de385d5b95 \ + # via -r cibuildwheel/resources/constraints.in distlib==0.3.0 \ --hash=sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21 \ # via virtualenv @@ -57,7 +58,7 @@ singledispatch==3.4.0.3 \ six==1.14.0 \ --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a \ --hash=sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c \ - # via pathlib2, singledispatch, virtualenv + # via pathlib2, virtualenv typing==3.7.4.1 \ --hash=sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 \ --hash=sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36 \ @@ -65,10 +66,12 @@ typing==3.7.4.1 \ # via importlib-resources virtualenv==20.0.8 \ --hash=sha256:0c04c7e8e0314470b4c2b43740ff68be1c62bb3fdef8309341ff1daea60d49d1 \ - --hash=sha256:1f0369d068d9761b5c1ed7b44dad1ec124727eb10bc7f4aaefbba0cdca3bd924 + --hash=sha256:1f0369d068d9761b5c1ed7b44dad1ec124727eb10bc7f4aaefbba0cdca3bd924 \ + # via -r cibuildwheel/resources/constraints.in wheel==0.34.2 \ --hash=sha256:8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \ - --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e + --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e \ + # via -r cibuildwheel/resources/constraints.in, delocate zipp==1.2.0 \ --hash=sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1 \ --hash=sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921 \ @@ -77,7 +80,9 @@ zipp==1.2.0 \ # The following packages are considered to be unsafe in a requirements file: pip==20.0.2 \ --hash=sha256:4ae14a42d8adba3205ebeb38aa68cfc0b6c346e1ae2e699a0b3bad4da19cef5c \ - --hash=sha256:7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f + --hash=sha256:7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f \ + # via -r cibuildwheel/resources/constraints.in setuptools==44.0.0 \ --hash=sha256:180081a244d0888b0065e18206950d603f6550721bd6f8c0a10221ed467dd78e \ - --hash=sha256:e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 + --hash=sha256:e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 \ + # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt new file mode 100644 index 00000000..937918bb --- /dev/null +++ b/cibuildwheel/resources/constraints-python36.txt @@ -0,0 +1,54 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# bin/update_constraints +# +appdirs==1.4.3 \ + --hash=sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 \ + --hash=sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e \ + # via virtualenv +delocate==0.8.0 \ + --hash=sha256:ac9f4d8d28b2582d94f764db0d72a1fe3c42ab8212e9b780168455de385d5b95 \ + # via -r cibuildwheel/resources/constraints.in +distlib==0.3.0 \ + --hash=sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21 \ + # via virtualenv +filelock==3.0.12 \ + --hash=sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59 \ + --hash=sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836 \ + # via virtualenv +importlib-metadata==1.5.0 \ + --hash=sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302 \ + --hash=sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b \ + # via importlib-resources, virtualenv +importlib-resources==1.3.1 \ + --hash=sha256:1dff36d42d94bd523eeb847c25c7dd327cb56686d74a26dfcc8d67c504922d59 \ + --hash=sha256:7f0e1b2b5f3981e39c52da0f99b2955353c5a139c314994d1126c2551ace9bdf \ + # via virtualenv +six==1.14.0 \ + --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a \ + --hash=sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c \ + # via virtualenv +virtualenv==20.0.8 \ + --hash=sha256:0c04c7e8e0314470b4c2b43740ff68be1c62bb3fdef8309341ff1daea60d49d1 \ + --hash=sha256:1f0369d068d9761b5c1ed7b44dad1ec124727eb10bc7f4aaefbba0cdca3bd924 \ + # via -r cibuildwheel/resources/constraints.in +wheel==0.34.2 \ + --hash=sha256:8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96 \ + --hash=sha256:df277cb51e61359aba502208d680f90c0493adec6f0e848af94948778aed386e \ + # via -r cibuildwheel/resources/constraints.in, delocate +zipp==3.1.0 \ + --hash=sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b \ + --hash=sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96 \ + # via importlib-metadata, importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +pip==20.0.2 \ + --hash=sha256:4ae14a42d8adba3205ebeb38aa68cfc0b6c346e1ae2e699a0b3bad4da19cef5c \ + --hash=sha256:7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f \ + # via -r cibuildwheel/resources/constraints.in +setuptools==45.2.0 \ + --hash=sha256:316484eebff54cc18f322dea09ed031b7e3eb00811b19dcedb09bc09bba7d93d \ + --hash=sha256:89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f \ + # via -r cibuildwheel/resources/constraints.in