Master docs (strawlab#144)

*Create Sphinx docs(strawlab#126#126, v0.3 Release Task list) *Separate Test Module(strawlab#126#126, v0.3 Release Task list) *visual.Show() Methods default argument Replace binary string(strawlab#124) *SegmentationNormal set_axis Function Implemented(strawlab#133)
natScience · Dec 7, 2017 · 15bd42a · 15bd42a
1 parent 66d25ca
commit 15bd42a
Show file tree

Hide file tree

Showing 195 changed files with 44,097 additions and 5,095 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,20 +8,108 @@ cache:
   - pip
   - ccache
 
+# https://docs.travis-ci.com/user/languages/cpp/
 matrix:
   include:
+    # gcc
+    # - os: linux
+    #   python: "2.7"
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    # - os: linux
+    #   python: "3.4"
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    # - os: linux
+    #   python: "3.5"
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    # gcc?
     - os: linux
       python: "2.7"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
       env:
       - PCL_VERSION="1.7"
+      - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+      - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     - os: linux
       python: "3.4"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
       env:
       - PCL_VERSION="1.7"
+      - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+      - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     - os: linux
-      python: "3.5"
+      python: "3.5"#
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
       env:
       - PCL_VERSION="1.7"
+      - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+      - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+
+    # clang
+    # apt-get no pcl use gcc
+    # - os: linux
+    #   python: "2.7"
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    #   addons:
+    #     apt:
+    #       sources:
+    #         - ubuntu-toolchain-r-test
+    #         - llvm-toolchain-precise-3.6
+    #       packages:
+    #         - clang-3.6
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    #   - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
+    # - os: linux
+    #   python: "3.4"
+    #   addons:
+    #     apt:
+    #       sources:
+    #         - ubuntu-toolchain-r-test
+    #         - llvm-toolchain-precise-3.6
+    #       packages:
+    #         - clang-3.6
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    #   - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
+    # - os: linux
+    #   python: "3.5"
+    #   addons:
+    #     apt:
+    #       sources:
+    #         - ubuntu-toolchain-r-test
+    #         - llvm-toolchain-precise-3.6
+    #       packages:
+    #         - clang-3.6
+    #   env:
+    #   - PCL_VERSION="1.7"
+    #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
+    #   - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
+
     # TravisCI TimeLimit 50min
     # - os: linux
     #   python: "2.7"
@@ -37,24 +125,57 @@ matrix:
     #   - PCL_VERSION="1.8"
 
     # TravisCI TimeLimit 50min
+    # gcc
     - os: osx
       language: generic
+      compiler: gcc
       env:
       - PYTHON_VERSION=2.7.10
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+      - NOSEATTR="not pcl_ver_0_4"
     - os: osx
       language: generic
+      compiler: gcc
       env:
       - PYTHON_VERSION=3.4.3
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+      - NOSEATTR="not pcl_ver_0_4"
     - os: osx
       language: generic
+      compiler: gcc
       env:
       - PYTHON_VERSION=3.5.1
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+      - NOSEATTR="not pcl_ver_0_4"
+    # clang
+    # homebrew pcl use gcc compiler
+    # - os: osx
+    #   language: generic
+    #   compiler: clang
+    #   env:
+    #   - PYTHON_VERSION=2.7.10
+    #   - PYENV_ROOT=~/.pyenv
+    #   - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    #   - NOSEATTR="not pcl_ver_0_4"
+    # - os: osx
+    #   language: generic
+    #   compiler: clang
+    #   env:
+    #   - PYTHON_VERSION=3.4.3
+    #   - PYENV_ROOT=~/.pyenv
+    #   - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    #   - NOSEATTR="not pcl_ver_0_4"
+    # - os: osx
+    #   language: generic
+    #   compiler: clang
+    #   env:
+    #   - PYTHON_VERSION=3.5.1
+    #   - PYENV_ROOT=~/.pyenv
+    #   - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    #   - NOSEATTR="not pcl_ver_0_4"
 
 
 # pcl 1.8.1 only(MacOSX/Ubuntu)
@@ -72,16 +193,21 @@ before_install:
 
       travis_wait 45 brew install pcl --without-qt;
 
+      ls /usr/local/include;
+
       cp -n ./travisCI/pcl_2d-1.8.pc /usr/local/lib/pkgconfig/pcl_2d-1.8.pc;
     fi
 
+# eval "${MATRIX_EVAL}";
 install:
   - if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.7" ) ]]; then
       sudo apt-get install openni2-utils
 
       sudo add-apt-repository ppa:v-launchpad-jochen-sprickerhof-de/pcl -y;
       sudo apt-get update -y;
       sudo apt-get install libpcl-all -y;
+
+      eval "${MATRIX_EVAL}";
     fi
   - if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.8" ) ]]; then
       sudo add-apt-repository -y ppa:webupd8team/java && sudo apt update && sudo apt -y install oracle-java8-installer;
@@ -113,14 +239,19 @@ install:
     fi
   - pip install --upgrade pip
   - pip install cython==0.25.2
+  - pip install nose
   - pip install numpy
   - pip install coveralls
   - python setup.py build_ext -i
   - python setup.py install
 
 script:
-  - coverage run --parallel-mode tests/test_pcl.py
-  - coverage run --parallel-mode tests/test_registration.py
+  # - coverage run --parallel-mode tests/test_pcl.py
+  # - coverage run --parallel-mode tests/test_registration.py
+  # - nosetests -A "$NOSEATTR" --with-coverage --cover-erase --cover-package=python-pcl --verbose
+  # - nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --with-coverage --cover-erase --cover-package=python-pcl --verbose
+  - nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --verbose
+
   # examples
   # - python examples/GrabberCallbackTest.py
   # examples/official

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,15 +8,17 @@ environment:
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
 
+  # https://www.appveyor.com/docs/build-environment/#miniconda
   matrix:
-  - PYTHON: "C:\\Miniconda3-x64"
+  - PYTHON: "C:\\Miniconda34-x64"
     PYTHON_VERSION: "3.4"
     PYTHON_ARCH: "64"
     PCL_ROOT: "C:\\Program Files\\PCL 1.6.0"
     PCL_VERSION: "1.6"
     OPENNI_VERSION: "1.3.2"
     OPENNI_ROOT: "C:\\Program Files\\OpenNI\\Bin64"
     APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI\\x64\\Bin64"
+    NOSEATTR: "not pcl_ver_0_4 and not pcl_over_17 and not pcl_over_18"
 
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     PYTHON: "C:\\Miniconda35-x64"
@@ -27,6 +29,7 @@ environment:
     OPENNI_VERSION: "2.2"
     OPENNI_ROOT: "C:\\Program Files\\OpenNI2\\Redist\\"
     APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI2\\x64\\Redist"
+    NOSEATTR: "not pcl_ver_0_4"
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -39,24 +42,31 @@ install:
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
           throw "There are newer queued builds for this pull request, failing early." }
 
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PCL_ROOT%\\bin;%PCL_ROOT%\\3rdParty\\VTK\\bin;%OPENNI_ROOT%;%PATH%;"
-  - "pip install --disable-pip-version-check --user --upgrade pip"
-  
+  # Python(set before conda command call)
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PATH%;"
+
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
   # - "%CMD_IN_ENV% python -m pip install -r dev-requirements.txt"
   # - "pip install wheel"
+  # - if [%PCL_VERSION%]==[1.6] anaconda search -t conda vc 10.*
+  # - if [%PCL_VERSION%]==[1.6] conda install -y -q anaconda-client
+  # - if [%PCL_VERSION%]==[1.6] SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PYTHON%\\Lib\\site-packages;%PATH%
   - "conda install -y -q wheel"
-  
+
   # Mini-conda ng
   # - "pip install --upgrade setuptools"
   # - conda install -y -q setuptools
   # use Visual Studio 2017?(over 34.4.0.)
   # under 36.2.2
   - conda install -y -q setuptools
-
+  # - "pip install --disable-pip-version-check --user --upgrade pip"
+
+  # PCL 
+  - "SET PATH=%PCL_ROOT%\\bin;%PCL_ROOT%\\3rdParty\\VTK\\bin;%OPENNI_ROOT%;%PATH%;"
+
   # PCL Install
   - ps : appveyor\install.ps1
 
@@ -84,8 +94,9 @@ build_script:
   - if [%PCL_VERSION%]==[1.6] copy "%APPVEYOR_OPENNI_ROOT%" "%PYTHON%\Lib\site-packages"
 
 test_script:
-  - python tests\test_pcl.py
-  - python tests\test_registration.py
+  # - python tests\test_pcl.py
+  # - python tests\test_registration.py
+  - nosetests -A "%NOSEATTR%" --verbose
 
   # - python examples\official\Filtering\PassThroughFilter.py
   # - python examples\official\Filtering\project_inliers.py

diff --git a/bld.bat b/bld.bat
@@ -0,0 +1,3 @@
+python setup.py build_ext -i
+python setup.py install
+nosetests -A "not pcl_ver_0_4"
diff --git a/build.bat b/build.bat
diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+python setup.py build_ext -i
+python setup.py install
+nosetests