diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..58a7d78 --- /dev/null +++ b/LICENCE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Sofus Rose + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/openlut-project b/project.geany similarity index 89% rename from openlut-project rename to project.geany index e7fb11e..280adb7 100644 --- a/openlut-project +++ b/project.geany @@ -28,7 +28,7 @@ long_line_column=72 [files] current_page=0 -FILE_NAME_0=1995;Python;0;EUTF-8;1;1;0;%2Fhome%2Fsofus%2Fsubhome%2Fsrc%2Fopenlut%2Fopenlut.py;0;4 +FILE_NAME_0=331;Python;0;EUTF-8;1;1;0;%2Fhome%2Fsofus%2Fsubhome%2Fsrc%2Fopenlut%2Fsetup.py;0;4 [VTE] last_dir=/home/sofus/subhome/src/linemarch diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..b88034e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file = README.md diff --git a/setup.py b/setup.py index 472dff2..3a4e59a 100755 --- a/setup.py +++ b/setup.py @@ -3,17 +3,12 @@ import sys, os import os.path as path -#~ from sysconfig import get_python_version, get_path - from setuptools import setup from setuptools import Extension from setuptools import find_packages -#Weirdly long way to get to the actual header files we need to include. -#~ pyPath = path.join(path.abspath(get_path('include') + os.sep + '..'), 'site/python{}'.format(get_python_version())) - -#Better - Mac & Linux only. -#~ pyPath = '/usr/local/include/python{}'.format(get_python_version())' +#pybind11, a dependency, can report its own includes! +import pybind11 #Make sure we're using gcc. os.environ["CC"] = "g++" @@ -24,7 +19,7 @@ link_args = ['-fopenmp'] olOpt = Extension( 'openlut.lib.olOpt', sources = ['openlut/lib/olOpt.cpp'], - #~ include_dirs=[pyPath], #Include from the the python3 source code. + include_dirs=[pybind11.get_include()], #Include pybind11. language = 'c++', extra_compile_args = cpp_args, extra_link_args = cpp_args @@ -43,9 +38,9 @@ setup( name = 'openlut', license = 'MIT Licence', - keywords = 'color image images processing', + keywords = ['color', 'image', 'images', 'processing'], - install_requires = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools'], + install_requires = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools', 'pybind11'], classifiers = [ 'Development Status :: 3 - Alpha',