Merge pull request #700 from pv/vendor-repo

Put vendorized files to a separate submodule repository

Downloading the asset files in setup.py can fail, and it is better to
force the download go via "git clone --recursive".

It is not useful to store minified JS/CSS files in the main repository,
so put them to a separate place. Clear separation may also make things
easier for linux distros that don't like minified files.

.gitignore

@@ -9,7 +9,6 @@ __pycache__
 # Other generated files
 MANIFEST
 asv/_version.py
-asv/www/vendor
 
 # Sphinx
 _build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "asv/www/vendor"]
+	path = asv/www/vendor
+	url = https://github.com/airspeed-velocity/asv-vendor

appveyor.yml

@@ -21,6 +21,9 @@ cache:
     - '%LOCALAPPDATA%\pip\Cache'
 
 install:
+    # Init and clone submodules
+    - git submodule update --init --recursive
+
     # Clear tmpdir (sometimes left behind by appveyor?)
     - rmdir /s /q %APPVEYOR_BUILD_FOLDER%\\tmp & exit /b 0
 

asv/commands/publish.py

@@ -103,14 +103,24 @@ def run(cls, conf, range_spec=None, pull=True):
         repo = get_repo(conf)
         benchmarks = Benchmarks.load(conf)
 
+        def copy_ignore(src, names):
+            # Copy only *.js and *.css in vendor dir
+            ignore = [fn for fn in names
+                      if (os.path.basename(src).lower() == 'vendor' and
+                          not fn.lower().endswith('.js') and
+                          not fn.lower().endswith('.css'))]
+            return ignore
+
         template_dir = os.path.join(
             os.path.dirname(os.path.abspath(__file__)), '..', 'www')
-        shutil.copytree(template_dir, conf.html_dir)
+        shutil.copytree(template_dir, conf.html_dir, ignore=copy_ignore)
 
         # Ensure html_dir is writable even if template_dir is on a read-only FS
         os.chmod(conf.html_dir, 0o755)
         for (pre, ds, fs) in os.walk(conf.html_dir):
-            for x in fs + ds:
+            for x in fs:
+                os.chmod(os.path.join(pre, x), 0o644)
+            for x in ds:
                 os.chmod(os.path.join(pre, x), 0o755)
 
         log.step()