:green: revive ci test for dev branch. #135 (#136)

* :green: revive ci test for dev branch. #135

* 💚 try with 3.6

* 🐛 fix travis config

* 🐛 fix travis config

* 💄 sync with latest config

* 🐛 fix travis config

* 🐛 fix travis config

Author: chfw

.moban.dt/local-travis.yml.jj2

@@ -3,7 +3,7 @@
 {% block custom_python_versions %}
 python:
   - 3.7
-  - 2.7
+  - 3.6
 {% endblock %}
 
 

.travis.yml

@@ -5,7 +5,33 @@ notifications:
   email: false
 python:
   - 3.7
-  - 2.7
+  - 3.6
+
+stages:
+  - lint
+  - moban
+  - test
+
+
+.lint: &lint
+  git:
+    submodules: false
+  python: 3.6
+  stage: lint
+  script: make install_test lint
+
+.moban: &moban
+  python: 3.6
+  stage: moban
+  install: pip install moban>=0.0.4 gitfs2 pypifs
+  script: make upstreaming git-diff-check
+
+jobs:
+  include:
+    - *moban
+    - *lint
+
+stage: test
 
 before_install:
   - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
@@ -24,13 +50,3 @@ script:
   - pytest
 after_success:
   codecov
-
-
-jobs:
-  include:
-    - stage: lint
-      before_install: false
-      script: make install_test lint
-    - stage: moban
-      install: pip install moban>=0.0.4 gitfs2 pypifs
-      script: make upstreaming git-diff-check

templates/travis.yml.jj2

@@ -41,23 +41,9 @@ stages:
   - test
 
 {% endblock %}
-.disable_global: &disable_global
-  addons: false
-  cache: false
-  env: {}
-  python: false
-  before_install: false
-  install: false
-  before_script: false
-  script: false
-  after_success: false
-  after_failure: false
-  before_deploy: false
-  deploy: false
 
 {% if lint_command != False %}
 .lint: &lint
-  <<: *disable_global
   git:
     submodules: false
   python: 3.6
@@ -70,7 +56,6 @@ stages:
 {% endif %}
 {% if moban_command != False %}
 .moban: &moban
-  <<: *disable_global
   python: 3.6
   stage: moban
   install: pip install moban>=0.0.4 gitfs2 pypifs

tests/fixtures/setup.py.output

@@ -60,6 +60,7 @@ CLASSIFIERS = [
 
 ]
 
+
 INSTALL_REQUIRES = [
 ]
 SETUP_COMMANDS = {}

tests/fixtures/setup_use_markers_false.py.output

@@ -60,6 +60,7 @@ CLASSIFIERS = [
 
 ]
 
+
 INSTALL_REQUIRES = [
 ]
 SETUP_COMMANDS = {}

tests/fixtures/setup_use_markers_true.py.output

@@ -60,6 +60,7 @@ CLASSIFIERS = [
 
 ]
 
+
 INSTALL_REQUIRES = [
 ]
 SETUP_COMMANDS = {}

tests/test_setup.py

@@ -12,6 +12,7 @@ def test_setup():
     yaml = YAML(typ="safe")
     context = yaml.load(content)
     rendered = get_rendered_file(filename, context)
+    print(rendered)
     expected = get_file_content("setup.py.output")
     assert expected == rendered
 
@@ -36,6 +37,5 @@ def test_setup_use_markers_false():
     yaml = YAML(typ="safe")
     context = yaml.load(content)
     rendered = get_rendered_file(filename, context)
-    print(rendered)
     expected = get_file_content("setup_use_markers_false.py.output")
     assert expected == rendered