Combine dev package build stages

.travis.yml

@@ -32,7 +32,7 @@ stages:
   - name: conda_core_dev_package
     if: tag =~ ^v(\d+|\.)*[a-z]\d*$
   - name: conda_recommended_dev_package
-    if: tag =~ ^v(\d+|\.)*[a-z]\d*$	
+    if: tag =~ ^v(\d+|\.)*[a-z]\d*$
   - name: pip_dev_package
     if: tag =~ ^v(\d+|\.)*[a-z]\d*$
   - name: conda_package
@@ -121,20 +121,13 @@ jobs:
 
     - &conda_pkg
       <<: *default  
-      stage: conda_core_dev_package
+      stage: conda_dev_package
       env: DESC="" TRAVIS_NOCACHE=$TRAVIS_JOB_ID CHANS=$CHANS_DEV LABELS=$LABELS_DEV
       install:
         - travis_wait 30 doit package_build --recipe=core $CHANS $PKG_TEST_PYTHON --test-group=unit
-      script:
-        - doit package_upload --token=$CONDA_UPLOAD_TOKEN $LABELS --recipe=core
-
-    - &conda_pkg
-      <<: *default
-      stage: conda_recommended_dev_package
-      env: DESC="" TRAVIS_NOCACHE=$TRAVIS_JOB_ID CHANS=$CHANS_DEV LABELS=$LABELS_DEV
-      install:
         - travis_wait 30 doit package_build --recipe=recommended $CHANS $PKG_TEST_PYTHON --test-group=examples
       script:
+        - doit package_upload --token=$CONDA_UPLOAD_TOKEN $LABELS --recipe=core
         - doit package_upload --token=$CONDA_UPLOAD_TOKEN $LABELS --recipe=recommended
 
     - <<: *conda_pkg