Makefile for virtualenv

diff --git a/.gitignore b/.gitignore
index d93c13c4f9b0694d4cfaa8df5680da8d950537c8..6e4e70bb2cd9c4825aadf1f095e250e23a287434 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /build/
 /dist/
 /MANIFEST
 /build/
 /dist/
 /MANIFEST

+/pypol.egg-info/
+/venv/

 __pycache__
 __pycache__

-/venv

diff --git a/Makefile b/Makefile
index 8b3f1c486bee03fff3d13dd3a91f87855fbe2ca2..edb6c695086ef7664805fe1228315df0783fccbe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 PYTHON=python3
 PYTHON=python3

+PIP=pip3
+VIRTUALENV=pyvenv

 RM=rm -rf
 
 .PHONY: default
 RM=rm -rf
 
 .PHONY: default


@@ -15,4 +17,12 @@ test:
 
 .PHONY: clean
 clean:
 
 .PHONY: clean
 clean:

-       $(RM) build dist MANIFEST pypol/__pycache__ tests/__pycache__ venv
+       $(RM) build dist MANIFEST venv
+       $(RM) pypol.egg-info pypol/islhelper.*.so pypol/__pycache__
+       $(RM) tests/__pycache__
+
+.PHONY: venv
+venv:
+       $(RM) venv
+       $(VIRTUALENV) venv
+       . venv/bin/activate; $(PIP) install -e .

diff --git a/pypol/.gitignore b/pypol/.gitignore
new file mode 100644 (file)
index 0000000..1476115
--- /dev/null
+++ b/pypol/.gitignore
@@ -0,0 +1 @@
+/islhelper.*.so

diff --git a/pypol/linear.py b/pypol/linear.py
index be30fad7528b21b0b330f6f2b6a50e1fca49ed2b..e69600ff951a699d6c95d6ed7e57c11d0310818e 100644 (file)
--- a/pypol/linear.py
+++ b/pypol/linear.py
@@ -1,11 +1,12 @@
 import functools
 import numbers
 import functools
 import numbers

-import json

 import ctypes, ctypes.util
 import ctypes, ctypes.util

-from pypol import isl, islhelper

 
 from fractions import Fraction, gcd
 
 
 from fractions import Fraction, gcd
 

+from . import isl, islhelper
+
+

 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p
 libisl = ctypes.CDLL(ctypes.util.find_library('isl'))
 
 libisl.isl_printer_get_str.restype = ctypes.c_char_p

diff --git a/setup.py b/setup.py
index 08587b761d39d515d0b517a697e30876ddf066a0..57aa813533ea9fb64df6b699a2dbc23f22a7f42b 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,6 @@ setup(
     author='MINES ParisTech',
     packages=['pypol'],
     ext_modules = [
     author='MINES ParisTech',
     packages=['pypol'],
     ext_modules = [

-        Extension('pypol/islhelper', sources=['pypol/islhelper.c'])
+        Extension('pypol.islhelper', sources=['pypol/islhelper.c'])

     ]
 )
     ]
 )