Merge pull request #3394 from ales-erjavec/fixes/setup-data-files

[FIX] setup.py: Remove trailing slash from directory names in data_files

Author: lanzagar

.ci_tools/appveyor/patch-vcvars.bat

@@ -18,7 +18,7 @@ environment:
     # disable threaded builds on Python 3.5+ when using numpy's distutils
     # (https://github.com/numpy/numpy/issues/7607)
     BUILD_GLOBAL_OPTIONS: build -j1
-    BUILD_ENV: wheel==0.29.0 pip==9.0.1 numpy==1.9.3
+    BUILD_ENV: wheel==0.29.0 pip==9.0.1 numpy==1.9.3 sphinx==1.8.2
     # SIP 4.19.4+ with PyQt5==5.9.1+ segfault our tests (GH-2756)
     TEST_ENV: sip==4.19.6 PyQt5==5.9.2 numpy~=1.14.0 scipy~=1.0.0 scikit-learn pandas==0.21.1
 
@@ -28,20 +28,18 @@ environment:
     - PYTHON: C:\Python36-x64
 
     - PYTHON: C:\Python37
-      BUILD_ENV: wheel==0.29.0 pip~=9.0.1 numpy~=1.14.0
+      BUILD_ENV: wheel==0.29.0 pip~=9.0.1 numpy~=1.14.0 sphinx==1.8.2
       # PyQt5 >= 5.11 32-bit no longer contains QtWebEngine
       TEST_ENV: PyQt5~=5.10.0 numpy~=1.14.0 scipy~=1.1.0 scikit-learn pandas
 
     - PYTHON: C:\Python37-x64
-      BUILD_ENV: wheel==0.29.0 pip~=9.0.1 numpy~=1.14.0
+      BUILD_ENV: wheel==0.29.0 pip~=9.0.1 numpy~=1.14.0 sphinx==1.8.2
       TEST_ENV: PyQt5~=5.11.1 numpy~=1.14.0 scipy~=1.1.0 scikit-learn pandas
 
 cache:
   - '%LOCALAPPDATA%\pip\cache -> appveyor.yml'
 
 install:
-  # Patch VC 2010 64-bit toolchain
-  - call .ci_tools/appveyor/patch-vcvars.bat
   # Configure pip: Add extra links url, force binary numpy, scipy, ...
   - echo [install]> pip.ini
   - echo find-links =>> pip.ini

appveyor.yml

@@ -248,7 +248,7 @@ def initialize_options(self):
 
 
 # ${prefix} relative install path for html help files
-DATAROOTDIR = "share/help/en/orange3/htmlhelp/"
+DATAROOTDIR = "share/help/en/orange3/htmlhelp"
 
 
 def findall(startdir, followlinks=False, ):
@@ -271,9 +271,15 @@ def find_htmlhelp_files(subdir):
     )
     for file in files:
         relpath = os.path.relpath(file, start=subdir)
-        data_files.append(
-            (os.path.join(DATAROOTDIR, os.path.dirname(relpath)), [file])
-        )
+        relsubdir = os.path.dirname(relpath)
+        # path.join("a", "") results in "a/"; distutils install_data does not
+        # accept paths that end with "/" on windows.
+        if relsubdir:
+            targetdir = os.path.join(DATAROOTDIR, relsubdir)
+        else:
+            targetdir = DATAROOTDIR
+        assert not targetdir.endswith("/")
+        data_files.append((targetdir, [file]))
     return data_files