From 767d3c1c35f0d4d7c16d4f99a9f812c051daa595 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Wed, 30 Dec 2020 17:54:19 +0000 Subject: math/py-or-tools: Update 7.7 -> 8.1 --- math/py-or-tools/files/patch-tools_setup.py.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'math/py-or-tools/files/patch-tools_setup.py.in') diff --git a/math/py-or-tools/files/patch-tools_setup.py.in b/math/py-or-tools/files/patch-tools_setup.py.in index 0a2314a73f4f..4d630e0eabd1 100644 --- a/math/py-or-tools/files/patch-tools_setup.py.in +++ b/math/py-or-tools/files/patch-tools_setup.py.in @@ -1,13 +1,15 @@ ---- tools/setup.py.in.orig 2020-08-03 20:20:27 UTC +See https://github.com/google/or-tools/issues/2305 + +--- tools/setup.py.in.orig 2020-12-09 16:30:21 UTC +++ tools/setup.py.in -@@ -46,8 +46,8 @@ setup( - 'ortools.util', - ], +@@ -42,8 +42,8 @@ setup( + version='VVVV', + packages=find_packages(), install_requires=[ -- 'protobuf >= 3.12.2', -- 'six >= 1.10', -+ #'protobuf >= 3.12.2', -+ #'six >= 1.10', +- 'protobuf >= 3.14.0', +- 'absl-py >= 0.11', ++ #'protobuf >= 3.14.0', ++ #'absl-py >= 0.11', ], package_data={ - 'ortools.constraint_solver' : ['_pywrapcp.dll'], + 'ortools.constraint_solver' : ['_pywrapcp.dll', '*.pyi'], -- cgit v1.2.3