Merge pull request #84 from ayan-b/sep-lint

Travis config for syncing template

Author: chfw

.travis.yml

@@ -31,12 +31,16 @@ stages:
   python: 2.7
   stage: moban
   install: pip install moban>=0.0.4
-  script: make
+  script:
+    - make
+    - make push	
 
 jobs:
   include:
     - *moban
     - *lint
+  allow_failures:
+    - test
 
 stage: test
 

Makefile

@@ -4,3 +4,11 @@ upstreaming:
 	moban -m mobanfile
 
 lint: flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
+
+push:
+	git config user.email "[email protected]"
+	git config user.name "traviscibot"
+	git add .
+	git reset HEAD =0.0.4
+	git commit -m "Sync templates [skip ci]"
+	git push https://moremoban:${GITHUB_TOKEN}@github.com/moremoban/pypi-mobans HEAD:moban -f

tests/fixtures/setup.py.output

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 
 # Template by pypi-mobans
-import os
-import sys
 import codecs
 import locale
+import os
 import platform
+import sys
 from shutil import rmtree
 
-from setuptools import Command, setup, find_packages
+from setuptools import Command, find_packages, setup
 
 PY2 = sys.version_info[0] == 2
 PY26 = PY2 and sys.version_info[1] < 7
@@ -22,52 +22,56 @@ PY33 = sys.version_info < (3, 4)
 try:
     lc = locale.getlocale()
     pf = platform.system()
-    if pf != 'Windows' and lc == (None, None):
-        locale.setlocale(locale.LC_ALL, 'C.UTF-8')
+    if pf != "Windows" and lc == (None, None):
+        locale.setlocale(locale.LC_ALL, "C.UTF-8")
 except (ValueError, UnicodeError, locale.Error):
-    locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+    locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
 
-NAME = ''
-AUTHOR = ''
-VERSION = ''
-EMAIL = ''
-LICENSE = ''
+NAME = "pypi-mobans"
+AUTHOR = "C.W."
+VERSION = ""
+EMAIL = "[email protected]"
+LICENSE = "NEW BSD"
 DESCRIPTION = (
-    'test'
+    "Scaffolding templates for your Python project."
 )
-URL = 'https://github.com//'
-DOWNLOAD_URL = '%s/archive/.tar.gz' % URL
-FILES = ['README.rst', 'CHANGELOG.rst']
+URL = "https://github.com/moremoban/pypi-mobans"
+DOWNLOAD_URL = "%s/archive/0.0.0.tar.gz" % URL
+FILES = ["README.rst", "CHANGELOG.rst"]
 KEYWORDS = [
-    'python',
+    "python",
 ]
 
 CLASSIFIERS = [
-    'Topic :: Software Development :: Libraries',
-    'Programming Language :: Python',
-    'Intended Audience :: Developers',
-    'Programming Language :: Python :: 2.6',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
-    'Programming Language :: Python :: 3.5',
-    'Programming Language :: Python :: 3.6',
+    "Topic :: Software Development :: Libraries",
+    "Programming Language :: Python",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+
+    "Programming Language :: Python :: 3.7",
+
+    "Programming Language :: Python :: 3.8",
+
 ]
 
 INSTALL_REQUIRES = [
 ]
 SETUP_COMMANDS = {}
 
 
-PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
+PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests"])
 EXTRAS_REQUIRE = {}
 # You do not need to read beyond this line
-PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
-    sys.executable)
-GS_COMMAND = ('gs  v ' +
-              "Find  in changelog for more details")
-NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
-                 'Please install gease to enable it.')
+PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
+GS_COMMAND = ("gs pypi-mobans v0.0.0 " +
+              "Find 0.0.0 in changelog for more details")
+NO_GS_MESSAGE = ("Automatic github release is disabled. " +
+                 "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (
     'Upload failed. please run "%s" yourself.' % PUBLISH_COMMAND)
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -76,13 +80,13 @@ HERE = os.path.abspath(os.path.dirname(__file__))
 class PublishCommand(Command):
     """Support setup.py upload."""
 
-    description = 'Build and publish the package on github and pypi'
+    description = "Build and publish the package on github and pypi"
     user_options = []
 
     @staticmethod
     def status(s):
         """Prints things in bold."""
-        print('\033[1m{0}\033[0m'.format(s))
+        print("\033[1m{0}\033[0m".format(s))
 
     def initialize_options(self):
         pass
@@ -92,14 +96,14 @@ class PublishCommand(Command):
 
     def run(self):
         try:
-            self.status('Removing previous builds...')
-            rmtree(os.path.join(HERE, 'dist'))
-            rmtree(os.path.join(HERE, 'build'))
-            rmtree(os.path.join(HERE, '.egg-info'))
+            self.status("Removing previous builds...")
+            rmtree(os.path.join(HERE, "dist"))
+            rmtree(os.path.join(HERE, "build"))
+            rmtree(os.path.join(HERE, "pypi_mobans.egg-info"))
         except OSError:
             pass
 
-        self.status('Building Source and Wheel (universal) distribution...')
+        self.status("Building Source and Wheel (universal) distribution...")
         run_status = True
         if has_gease():
             run_status = os.system(GS_COMMAND) == 0
@@ -113,7 +117,7 @@ class PublishCommand(Command):
 
 
 SETUP_COMMANDS.update({
-    'publish': PublishCommand
+    "publish": PublishCommand
 })
 
 
@@ -142,7 +146,7 @@ def read_files(*files):
 def read(afile):
     """Read a file into setup"""
     the_relative_file = os.path.join(HERE, afile)
-    with codecs.open(the_relative_file, 'r', 'utf-8') as opened_file:
+    with codecs.open(the_relative_file, "r", "utf-8") as opened_file:
         content = filter_out_test_code(opened_file)
         content = "".join(list(content))
         return content
@@ -151,11 +155,11 @@ def read(afile):
 def filter_out_test_code(file_handle):
     found_test_code = False
     for line in file_handle.readlines():
-        if line.startswith('.. testcode:'):
+        if line.startswith(".. testcode:"):
             found_test_code = True
             continue
         if found_test_code is True:
-            if line.startswith('  '):
+            if line.startswith("  "):
                 continue
             else:
                 empty_line = line.strip()
@@ -165,14 +169,14 @@ def filter_out_test_code(file_handle):
                     found_test_code = False
                     yield line
         else:
-            for keyword in ['|version|', '|today|']:
+            for keyword in ["|version|", "|today|"]:
                 if keyword in line:
                     break
             else:
                 yield line
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     setup(
         test_suite="tests",
         name=NAME,
@@ -186,7 +190,7 @@ if __name__ == '__main__':
         license=LICENSE,
         keywords=KEYWORDS,
         extras_require=EXTRAS_REQUIRE,
-        tests_require=['nose'],
+        tests_require=["nose"],
         install_requires=INSTALL_REQUIRES,
         packages=PACKAGES,
         include_package_data=True,

tests/test_setup.py

@@ -1,11 +1,17 @@
+import os
+
+from ruamel.yaml import YAML
+
 from test_utils import get_file_content, get_rendered_file
 
 
 def test_setup():
     filename = 'setup.py.jj2'
-    context = dict(
-        description="test"
-    )
+    with open(os.path.join("config", "data.yml"))as f:
+        content = f.read()
+    yaml = YAML(typ='safe')
+    context = yaml.load(content)
+    print(context)
     rendered = get_rendered_file(filename, context)
-    expected_requirements = get_file_content('setup.py.output')
-    assert expected_requirements == rendered
+    expected = get_file_content('setup.py.output')
+    assert expected == rendered