Merge pull request #10 from jcrivenaes/setup-enhance

Setup enhance

Author: jcrivenaes

.gitignore

@@ -70,3 +70,4 @@ target/
 # other
 .idea/
 .projectile
+'.'/

Makefile

@@ -69,6 +69,7 @@ clean-build: ## remove build artifacts
 	rm -fr build/
 	rm -fr dist/
 	rm -fr .eggs/
+	rm -fr \'.\'/
 	find . -name '*.egg-info' -exec rm -fr {} +
 	find . -name '*.egg' -exec rm -fr {} +
 

setup.py

@@ -30,6 +30,32 @@
 ]
 
 
+def the_version():
+    """Process the version, to avoid non-pythonic version schemes.
+
+    Means that e.g. 1.5.12+2.g191571d.dirty is turned to 1.5.12.2.dev0
+    """
+
+    version = versioneer.get_version()
+    sver = version.split('.')
+    print('\n\n\nUSING VERSION {}\n\n'.format(sver))
+
+    useversion = 'UNSET'
+    if len(sver) == 3:
+        useversion = version
+    else:
+        bugv = sver[2].replace('+', '.')
+
+        if 'dirty' in version:
+            ext = '.dev0'
+        else:
+            ext = ''
+        useversion = '{}.{}.{}{}'.format(sver[0], sver[1], bugv, ext)
+
+    print('\n\n\nUSING VERSION {}\n\n'.format(useversion))
+    return useversion
+
+
 class build(_build):
     # different order: build_ext *before* build_py
     sub_commands = [('build_ext', _build.has_ext_modules),
@@ -50,17 +76,15 @@ class build(_build):
 # cxtgeo extension module
 _cxtgeo = Extension('xtgeo.cxtgeo._cxtgeo',
                     sources=sources,
+                    extra_compile_args=['-Wno-uninitialized'],
                     include_dirs=['src/xtgeo/cxtgeo/clib/src', numpy_include],
                     library_dirs=['src/xtgeo/cxtgeo/clib/lib'],
                     libraries=['cxtgeo'],
-                    swig_opts=['-modern'],
-)
-
-
+                    swig_opts=['-modern'])
 
 setup(
     name='xtgeo',
-    version=versioneer.get_version(),
+    version=the_version(),
     cmdclass=versioneer.get_cmdclass(),
     description="XTGeo Python library for grids, surfaces, wells, etc",
     long_description=readme + '\n\n' + history,

src/xtgeo/cxtgeo/clib/README

@@ -10,7 +10,6 @@
  *
  */
 
-#include <omp.h>
 #include <stdio.h>