PRJ: Merge branch 'development'

VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

appveyor.yml

@@ -9,22 +9,27 @@ environment:
       MINICONDA: C:\Miniconda-x64
       PYTHON_ARCH: "64"
     - PYTHON_VERSION: 3.7
-      MINICONDA: C:\Miniconda
+      MINICONDA: C:\Miniconda37
       PYTHON_ARCH: "32"
     - PYTHON_VERSION: 3.7
-      MINICONDA: C:\Miniconda-x64
+      MINICONDA: C:\Miniconda37-x64
       PYTHON_ARCH: "64"
+  PYPI_PASSWORD:
+    secure: Zw0hha0+/4KCvYqgBYpOHGbrc9jrvtHq8N0xXkWSvLk=
+
+platform:
+  - x64
 
 init:
-  - "ECHO %PYTHON%"
-  - ps: Start-FileDownload 'http://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi' C:\VCForPython27.msi; echo "Done"
-  - cmd: msiexec /i C:\VCForPython27.msi /quiet /qn
+#  - ps: Start-FileDownload 'http://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi' C:\VCForPython27.msi; echo "Done"
+#  - cmd: msiexec /i C:\VCForPython27.msi /quiet /qn
 
 install:
   # Miniconda setup + necessary external packages
-  - set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%  # Miniconda is already installed on appveyor: https://github.com/appveyor/ci/issues/359
+  - set PATH=%MINICONDA%;%MINICONDA%\Scripts;%MINICONDA%\Library\bin;%PATH%
   - conda update --yes conda
-  - conda install --yes cython numpy pytables nose
+  - conda info -a
+  - conda install --yes cython numpy pytables nose twine
   - pip install -e .
   - conda list
 
@@ -33,6 +38,19 @@ test_script:
 
 after_test:
   - python setup.py bdist_wheel
+  - ps: rm dist/*.egg
 
 artifacts:
   - path: dist\*
+    name: pypiartifacts
+
+deploy_script:
+  - echo "Starting deployment"
+  - echo [distutils] > %USERPROFILE%\\.pypirc
+  - echo index-servers = >> %USERPROFILE%\\.pypirc
+  - echo     pypi >> %USERPROFILE%\\.pypirc
+  - echo [pypi] >> %USERPROFILE%\\.pypirc
+  - echo username=laborleben >> %USERPROFILE%\\.pypirc
+  - echo password=%PYPI_PASSWORD% >> %USERPROFILE%\\.pypirc
+  - ps: If ($env:APPVEYOR_REPO_TAG -eq "true" -And $env:APPVEYOR_REPO_BRANCH -eq "master") { Invoke-Expression "twine upload --skip-existing dist/*.whl" 2>$null } Else { write-output "Not on a tag on master, won't deploy"}
+  - echo "Finished deployment"

pybar_fei4_interpreter/Basis.h

@@ -16,10 +16,14 @@
 
 // for (u)int64_t event_number
 #ifdef _MSC_VER
+#if _MSC_VER >= 1600  // MSVC++ 10 (2010)
+#include <stdint.h>
+#else
 #define INFINITY (DBL_MAX+DBL_MAX)
 #define NAN (INFINITY-INFINITY)
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
+#endif
 #else
 #include <stdint.h>
 #endif

pybar_fei4_interpreter/defines.h

@@ -7,7 +7,11 @@
 #include <stddef.h>
 // for (u)int64_t event_number
 #ifdef _MSC_VER
+#if _MSC_VER >= 1600  // MSVC++ 10 (2010)
+#include <stdint.h>
+#else
 #include "external/stdint.h"
+#endif
 #else
 #include <stdint.h>
 #endif