Fixes to evaluated branch and deployment links

.travis.yml

@@ -158,13 +158,15 @@ jobs:
         - doit archive_project --name $DIR
         - anaconda-project prepare --directory $DIR
         - source activate $DIR/envs/default && pip install pyctdev
-        - conda install -y -c pyviz/label/dev "nbsite>=0.6.5" holoviews sphinx_pyviz_theme selenium phantomjs lxml nomkl
+        - which holoviews || conda install holoviews # Avoid clobbering an installed hv
+        - conda install -y "pyviz/label/dev::nbsite>=0.6.5" sphinx_pyviz_theme selenium phantomjs lxml nomkl
         - doit build_project --name $DIR
       after_success:
         - git config user.email "travis@travis.org"
         - git config user.name "travis"
         - mv ./doc/$DIR ./tmp
         - git fetch https://github.com/$TRAVIS_REPO_SLUG.git evaluated:refs/remotes/evaluated
+        - git diff
         - git checkout evaluated || travis_terminate 1
         - if [ -e  ./doc/$DIR ]; then rm -rf ./doc/$DIR; fi
         - mkdir ./doc/$DIR

attractors/anaconda-project.yml

@@ -10,6 +10,8 @@ labels:
 channels:
   - pyviz
 
+user_fields: [labels, skip, maintainers]
+
 packages: &pkgs
   - python=3.7
   - notebook=6.0

bay_trimesh/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

boids/anaconda-project.yml

@@ -7,6 +7,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

census/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - datashader
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

datashader_dashboard/anaconda-project.yml

@@ -10,6 +10,8 @@ labels:
   - datashader
   - panel
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
   - nodefaults

doc/conf.py

@@ -41,16 +41,9 @@ def gallery_spec(name):
         spec = yaml.safe_load(f)
     default = list(spec['commands'].values())[0]
     url_name = name.replace('_', '-')
-    if 'notebook' in default.keys():
-        deployment_urls = [
-            f'https://{url_name}.pyviz.demo.anaconda.com/notebooks/',
-            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com/notebooks/',
-        ]
-    else:
-        deployment_urls = [
-            f'https://{url_name}.pyviz.demo.anaconda.com/',
-            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com/notebooks/',
-        ]
+    deployment_urls = [
+            f'https://{url_name}.pyviz.demo.anaconda.com',
+            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com']
     description = spec['description']
     orphans = spec.get('orphans', [])
     if 'index.ipynb' in os.listdir(os.path.join('..', name)):

dodo.py

@@ -210,6 +210,7 @@ def archive_project(root='', name='all'):
             spec.pop('created', '')
             spec.pop('skip', '')
             spec.pop('orphans', '')
+            spec.pop('user_fields', '')
 
             # commands and envs that users don't need
             spec['commands'].pop('test', '')

euler/anaconda-project.yml

@@ -8,6 +8,8 @@ labels:
   - panel
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

gapminders/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - panel
   - channel_conda-forge
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
   - nodefaults

glaciers/anaconda-project.yml

@@ -8,6 +8,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

gull_tracking/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - datashader
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

heat_and_trees/anaconda-project.yml

@@ -12,6 +12,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

hipster_dynamics/anaconda-project.yml

@@ -10,6 +10,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

iex_trading/anaconda-project.yml

@@ -14,6 +14,8 @@ labels:
 skip:
   - IEX_to_CSV.ipynb
 
+user_fields: [labels, skip, maintainers]
+
 channels: [pyviz/label/dev]
 
 packages: &pkgs

landsat/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

lsystems/anaconda-project.yml

@@ -6,6 +6,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

ml_annotators/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - holoviews
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - pyviz/label/dev
 

network_packets/anaconda-project.yml

@@ -8,6 +8,8 @@ labels:
   - datashader
   - networkx
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

nyc_taxi/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - datashader
   - panel
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

osm/anaconda-project.yml

@@ -6,6 +6,8 @@ maintainers:
 labels:
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

portfolio_optimizer/anaconda-project.yml

@@ -8,6 +8,8 @@ labels:
   - hvplot
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

square_limit/anaconda-project.yml

@@ -6,6 +6,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

sri_model/anaconda-project.yml

@@ -8,6 +8,8 @@ labels:
   - holoviews
   - networkx
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

uk_researchers/anaconda-project.yml

@@ -6,6 +6,8 @@ maintainers:
 labels:
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs

voila_gpx_viewer/anaconda-project.yml

@@ -9,6 +9,8 @@ labels:
   - bqplot
   - ipyleaflet
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
 

walker_lake/anaconda-project.yml

@@ -7,6 +7,8 @@ labels:
   - datashader
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: [conda-forge]
 
 packages: &pkgs