Trying with setup.py!

Author: msis

.appveyor.yml

@@ -2,14 +2,14 @@ version: devel-{build}
 
 os: Visual Studio 2015
 
-test: off
-
 platform:
     - x64
     - x86
 
 environment:
     matrix:
+    - PYTHON: 27
+    - PYTHON: 36
     - CONDA: 27
     - CONDA: 35
 
@@ -21,13 +21,15 @@ install:
         if ($env:PYTHON) {
           if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
           $env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
-          pip install --disable-pip-version-check --user --upgrade pip wheel
-          pip install pytest numpy scipy
+          pip install --disable-pip-version-check --user --upgrade pip setuptools
         } elseif ($env:CONDA) {
           if ($env:CONDA -eq "27") { $env:CONDA = "" }
           if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
           $env:PATH = "C:\Miniconda$env:CONDA\;C:\Miniconda$env:CONDA\Scripts\;$env:PATH"
-          conda install -y -q pytest numpy scipy
+          conda config --set always_yes yes --set changeps1 no
+          conda config --add channels conda-forge
+          conda update -q conda
+          conda install -q conda-build
         }
     - if "%platform%" == "x64" SET VS_FULL=Visual Studio 14 2015 Win64
     - if "%platform%" == "x86" SET VS_FULL=Visual Studio 14 2015
@@ -36,16 +38,25 @@ install:
     - cd core-moos
     - mkdir build
     - cd build
-    - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=Release ../
+    - cmake -G "%VS_FULL%" -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DCMAKE_BUILD_TYPE=Release ../
     - cmake --build . --config Release
     - cmake --build . --config Release --target install
 
 build_script:
     - cd %APPVEYOR_BUILD_FOLDER%
-    - mkdir build
-    - cd build
-    - cmake -G "%VS_FULL%"
-    - cmake --build . --config Release
+    - ps: |
+        if ($env:PYTHON) {
+          python setup.py sdist
+          pip install --verbose dist\pymoos-0.0.1.tar.gz
+        } else {
+          conda build conda.recipe
+          conda install --use-local pymoos
+        }
 
-on_success:
-    - cmake --build . --config Release --target install
+test_script:
+    - ps: |
+        cd tests
+        python run_close.py
+        python simple_comms.py
+        python register.py
+        python callbacks.py

.travis.yml

@@ -1,26 +1,33 @@
 language: cpp
-
-sudo: required
-
-os:
-    - linux
-    - osx
-
-compiler:
-    - gcc
-
-env:
-    - PYTHON_VERSION=2.7
-    - PYTHON_VERSION=3.2
-
+matrix:
+  include:
+  - os: linux
+    env: PYTHON=2.7
+  - os: linux
+    env: PYTHON=3.5
+  - os: linux
+    env: CONDA=2.7
+  - os: linux
+    env: CONDA=3.5
+  - os: osx
+    env: PYTHON=2.7
+  - os: osx
+    env: PYTHON=3.6
+  - os: osx
+    env: CONDA=2.7
+  - os: osx
+    env: CONDA=3.5
 addons:
-    apt:
-        sources:
-            - ubuntu-toolchain-r-test
-            - kubuntu-backports
-        packages:
-            - g++-4.8
-            - cmake
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    - deadsnakes
+    - kubuntu-backports
+    packages:
+    - g++-4.8
+    - python3.5
+    - python3.5-dev
+    - cmake
 
 before_install:
     - if [ "`uname`" != "Darwin" ] ; then export MOOS_CXX_FLAGS="-fPIC -Wno-long-long"; fi
@@ -30,21 +37,45 @@ before_install:
     - cd core-moos
     - mkdir build
     - cd build
-    - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DTIME_WARP_AGGLOMERATION=0.4 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS ..
+    - cmake -DENABLE_EXPORT=ON -DUSE_ASYNC_COMMS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=$MOOS_CXX_FLAGS ..
     - cmake --build . --config Release --config -j4
     - sudo cmake --build . --config Release --target install
     - cd $TRAVIS_BUILD_DIR
-    - mkdir build/
+    - |
+      if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi
+      if [ -n "$PYTHON" ]; then
+        if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${PYTHON:0:1}" = "3" ]; then
+          brew update; brew install python3;
+        fi
+        pip install --user --upgrade pip virtualenv
+        virtualenv -p python$PYTHON venv
+        source venv/bin/activate
+      elif [ -n "$CONDA" ]; then
+        if [ "$TRAVIS_OS_NAME" = "linux" ]; then OS=Linux-x86_64; else OS=MacOSX-x86_64; fi
+        wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-$OS.sh
+        bash miniconda.sh -b -p $HOME/miniconda
+        export PATH="$HOME/miniconda/bin:$PATH"
+        conda config --set always_yes yes --set changeps1 no
+        conda config --add channels conda-forge
+        conda update -q conda
+        conda install -q conda-build
+        conda create -q -n test-environment python=$CONDA
+        source activate test-environment
+      fi
 
 install:
-    - cd build/
-    - cmake .. -DPYBIND11_PYTHON_VERSION=$PYTHON_VERSION
-    - cmake --build .
-
-before_script:
-    - mkdir pymoos && cp pymoos.so pymoos/
-    - cp ../__init__.py pymoos/
-    - export PYTHONPATH=$PWD
+    - |
+      if [ -n "$PYTHON" ]; then
+        python setup.py sdist
+        pip install --verbose dist/*.tar.gz
+      elif [ -n "$CONDA" ]; then
+        conda build conda.recipe
+        conda install --use-local pymoos
+      fi
 
 script:
-    - ctest -V
+    - cd tests/
+    - python run_close.py
+    - python simple_comms.py
+    - python register.py
+    - python callbacks.py

CMakeLists.txt

@@ -4,104 +4,6 @@ find_package(MOOS 10 REQUIRED)
 
 
 add_subdirectory(pybind11)
-pybind11_add_module(pymoos pyMOOS.cpp)
+pybind11_add_module(pymoos src/pyMOOS.cpp)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${MOOS_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR})
-
-
-set_target_properties(pymoos
-  PROPERTIES
-  SUFFIX ".so")
-
-set_target_properties(pymoos
-  PROPERTIES
-  PREFIX "")
-
-#########################################################Saad
-if (WIN32)
-  if (MSVC)
-    # /bigobj is needed for bigger binding projects due to the limit to 64k
-    # addressable sections. /MP enables multithreaded builds (relevant when
-    # there are many files).
-    set_target_properties(pymoos PROPERTIES COMPILE_FLAGS "/MP /bigobj ")
-
-    if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
-      # Enforce size-based optimization and link time code generation on MSVC
-      # (~30% smaller binaries in experiments).
-      set_target_properties(pymoos APPEND_STRING PROPERTY COMPILE_FLAGS "/Os /GL ")
-      set_target_properties(pymoos APPEND_STRING PROPERTY LINK_FLAGS "/LTCG ")
-    endif()
-  endif()
-
-  # .PYD file extension on Windows
-  set_target_properties(pymoos PROPERTIES SUFFIX ".pyd")
-
-  # Link against the Python shared library
-  target_link_libraries(pymoos PUBLIC ${PYTHON_LIBRARY} ${MOOS_LIBRARIES})
-elseif (UNIX)
-  # It's quite common to have multiple copies of the same Python version
-  # installed on one's system. E.g.: one copy from the OS and another copy
-  # that's statically linked into an application like Blender or Maya.
-  # If we link our plugin library against the OS Python here and import it
-  # into Blender or Maya later on, this will cause segfaults when multiple
-  # conflicting Python instances are active at the same time (even when they
-  # are of the same version).
-
-  # Windows is not affected by this issue since it handles DLL imports
-  # differently. The solution for Linux and Mac OS is simple: we just don't
-  # link against the Python library. The resulting shared library will have
-  # missing symbols, but that's perfectly fine -- they will be resolved at
-  # import time.
-
-  # .SO file extension on Linux/Mac OS
-  set_target_properties(pymoos PROPERTIES SUFFIX ".so")
-
-  # Strip unnecessary sections of the binary on Linux/Mac OS
-  if(APPLE)
-    set_target_properties(pymoos PROPERTIES MACOSX_RPATH ".")
-    set_target_properties(pymoos PROPERTIES LINK_FLAGS "-undefined dynamic_lookup ")
-    if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
-      add_custom_command(TARGET pymoos POST_BUILD COMMAND strip -u -r ${PROJECT_BINARY_DIR}/pymoos.so)
-    endif()
-    target_link_libraries(pymoos PUBLIC ${PYTHON_LIBRARIES} ${MOOS_LIBRARIES})
-  else()
-    if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
-      add_custom_command(TARGET pymoos POST_BUILD COMMAND strip ${PROJECT_BINARY_DIR}/pymoos.so)
-    endif()
-    target_link_libraries(pymoos ${PYTHON_LIBRARIES} ${MOOS_LIBRARIES})
-  endif()
-
-endif()
-
-file(GLOB ExampleFiles ${CMAKE_SOURCE_DIR}/Documentation/examples/*.py)
-add_custom_target(copy)
-get_target_property(pymoosLocation pymoos LOCATION)
-get_filename_component(pymoosDir ${pymoosLocation} PATH)
-foreach(ExampleFile ${ExampleFiles})
-  add_custom_command(TARGET copy PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E
-                         copy ${ExampleFile} ${pymoosDir})
-endforeach()
-add_dependencies(pymoos copy)
-
-
-execute_process(COMMAND
-    ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_lib(1,0,\"\"))"
-    OUTPUT_VARIABLE PYTHON_INSTALL
-    ERROR_VARIABLE PYTHON_STDERR
-    RESULT_VARIABLE PYTHON_ERR
-)
-if(NOT PYTHON_INSTDIR)
-  set(PYTHON_INSTDIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL})
-endif(NOT PYTHON_INSTDIR)
-if(WIN32)
-  string(REGEX REPLACE "\\\\" "/" PYTHON_INSTDIR ${PYTHON_INSTDIR})
-endif(WIN32)
-message(STATUS "pymoos will be installed in ${PYTHON_INSTDIR}")
-INSTALL(FILES ${CMAKE_BINARY_DIR}/pymoos.so
-              __init__.py
-    DESTINATION ${PYTHON_INSTDIR}/pymoos/
-)
-
-###### Testing ######
-include( CTest )
-ADD_SUBDIRECTORY(testing)
+target_link_libraries(pymoos ${PYTHON_LIBRARIES} ${MOOS_LIBRARIES})

MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md LICENSE
+global-include CMakeLists.txt *.cmake
+recursive-include src *
+recursive-include pybind11/include *.h

setup.py

@@ -0,0 +1,69 @@
+import os
+import re
+import sys
+import platform
+import subprocess
+
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+from distutils.version import LooseVersion
+
+
+class CMakeExtension(Extension):
+    def __init__(self, name, sourcedir=''):
+        Extension.__init__(self, name, sources=[])
+        self.sourcedir = os.path.abspath(sourcedir)
+
+
+class CMakeBuild(build_ext):
+    def run(self):
+        try:
+            out = subprocess.check_output(['cmake', '--version'])
+        except OSError:
+            raise RuntimeError("CMake must be installed to build the following extensions: " +
+                               ", ".join(e.name for e in self.extensions))
+
+        if platform.system() == "Windows":
+            cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+            if cmake_version < '3.1.0':
+                raise RuntimeError("CMake >= 3.1.0 is required on Windows")
+
+        for ext in self.extensions:
+            self.build_extension(ext)
+
+    def build_extension(self, ext):
+        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+                      '-DPYTHON_EXECUTABLE=' + sys.executable]
+
+        cfg = 'Debug' if self.debug else 'Release'
+        build_args = ['--config', cfg]
+
+        if platform.system() == "Windows":
+            cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
+            if sys.maxsize > 2**32:
+                cmake_args += ['-A', 'x64']
+            build_args += ['--', '/m']
+        else:
+            cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
+            build_args += ['--', '-j2']
+
+        env = os.environ.copy()
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
+                                                              self.distribution.get_version())
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
+        subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+
+setup(
+    name='pymoos',
+    version='0.0.1',
+    author='Mohamed Saad Ibn Seddik',
+    author_email='ms.ibnseddik@gmail.com',
+    description='MOOS python wrapper.',
+    long_description='',
+    ext_modules=[CMakeExtension('pymoos')],
+    cmdclass=dict(build_ext=CMakeBuild),
+    zip_safe=False,
+)