From 7d4575d0d31850a1c9de523d5569e704bcde4634 Mon Sep 17 00:00:00 2001 From: Bertrand Servin Date: Fri, 2 Apr 2021 09:34:54 +0200 Subject: [PATCH 1/3] Use setuptools for packaging : fix broken pip install --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index eca955c..2bda10c 100644 --- a/setup.py +++ b/setup.py @@ -20,9 +20,9 @@ ''' from __future__ import print_function -from distutils.core import setup -from distutils.extension import Extension -from distutils.command.build_ext import build_ext as _build_ext +from setuptools import setup +from setuptools.extension import Extension +from setuptools.command.build_ext import build_ext as _build_ext from distutils.errors import CCompilerError from distutils.spawn import find_executable import subprocess as sp @@ -91,6 +91,7 @@ def build_extension(self, ext): self.builtsolvernames.append(ext.name.split('.')[-1][1:]) except CCompilerError: + print("Could not build %s"%ext.name) self.failedsolvernames.append(ext.name.split('.')[-1][1:]) @@ -598,7 +599,7 @@ def get_scipcomponent_folder(comp): setup( name='Numberjack', - version='1.2.0', + version='1.2.1', author='Numberjack Developers', packages=['Numberjack', 'Numberjack.solvers'], ext_modules=extensions, From 3402db8dd873ddd1fbfa9bb959c2dbc103131935 Mon Sep 17 00:00:00 2001 From: Bertrand Servin Date: Fri, 2 Apr 2021 09:54:14 +0200 Subject: [PATCH 2/3] Remove unecessary print --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2bda10c..64bac19 100644 --- a/setup.py +++ b/setup.py @@ -91,7 +91,7 @@ def build_extension(self, ext): self.builtsolvernames.append(ext.name.split('.')[-1][1:]) except CCompilerError: - print("Could not build %s"%ext.name) + self.failedsolvernames.append(ext.name.split('.')[-1][1:]) From bc31ca6d6f6090fe87d89642a26b5bcad0efa71f Mon Sep 17 00:00:00 2001 From: Bertrand Servin Date: Fri, 2 Apr 2021 09:56:14 +0200 Subject: [PATCH 3/3] Remove unecessary print --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 64bac19..7088587 100644 --- a/setup.py +++ b/setup.py @@ -91,7 +91,6 @@ def build_extension(self, ext): self.builtsolvernames.append(ext.name.split('.')[-1][1:]) except CCompilerError: - self.failedsolvernames.append(ext.name.split('.')[-1][1:])