Merge pull request #3 from SylvainCorlay/entry-point

Use Python entry point

mamba/FastSubdirData.py

@@ -191,4 +191,4 @@ class FastSubdirData(object):
                 return _internal_state
 
     def _process_raw_repodata_str(self, raw_repodata_str):
-        self.raw_repodata_str = raw_repodata_str
+        self.raw_repodata_str = raw_repodata_str

mamba/__init__.py

@@ -0,0 +1,2 @@
+from ._version import version_info, __version__
+

mamba/_version.py

@@ -0,0 +1,2 @@
+version_info = (0, 0, 1)
+__version__ = '.'.join(map(str, version_info))

mamba/mamba.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import sys, os
 
 from conda.cli.main import generate_parser
@@ -20,11 +18,11 @@ from conda.base.constants import ChannelPriority
 
 import json
 import tempfile
+from multiprocessing.pool import Pool as MPool
 
-from mamba.FastSubdirData import FastSubdirData
+from .FastSubdirData import FastSubdirData
 
 import mamba.mamba_api as api
-from multiprocessing.pool import Pool as MPool
 
 def get_channel(x):
     print("Getting ", x)
@@ -168,7 +166,3 @@ def main():
         os.unlink(installed_json_f.name)
     except:
         pass
-
-
-if __name__ == '__main__':
-    sys.exit(main())

setup.py

@@ -35,7 +35,8 @@ ext_modules = [
         ['include/py_interface.cpp', 'include/parsing.cpp', 'include/solver.cpp', 'include/thirdparty/simdjson/simdjson.cpp'],
         include_dirs=[
             get_pybind_include(),
-            get_pybind_include(user=True)
+            get_pybind_include(user=True),
+            os.path.join(libsolv_prefix, 'include')
         ],
         libraries=['solv'],
         language='c++'
@@ -93,7 +94,11 @@ setup(
     url='https://github.com/wolfv/mamba',
     description='Faster than a conda?!',
     packages=['mamba'],
-    scripts=['bin/mamba'],
+    entry_points={
+        'console_scripts': [
+            'mamba = mamba.mamba:main'
+        ]
+    },
     long_description='A (hopefully faster) reimplementation of the slow bits of conda.',
     ext_modules=ext_modules,
     install_requires=['pybind11>=2.2'],