Merge pull request #137 from moremoban/dev

Emergency fix on travis config

Author: chfw

.gitignore

@@ -52,8 +52,10 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
+cover/
 
 # Translations
 *.mo
@@ -63,6 +65,7 @@ coverage.xml
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -75,6 +78,7 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
@@ -85,17 +89,23 @@ profile_default/
 ipython_config.py
 
 # pyenv
-.python-version
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
 #   install all needed dependencies.
 #Pipfile.lock
 
-# celery beat schedule file
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
@@ -127,6 +137,16 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# static files generated from Django application using `collectstatic`
+media
+static
+
 # VirtualEnv rules
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -159,6 +179,7 @@ pip-selfcheck.json
 # Windows rules
 # Windows thumbnail cache files
 Thumbs.db
+Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 
@@ -264,13 +285,15 @@ flycheck_*.el
 # Vim rules
 # Swap
 [._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
 [._]sw[a-p]
 
 # Session
 Session.vim
+Sessionx.vim
 
 # Temporary
 .netrwhist
@@ -281,7 +304,7 @@ tags
 [._]*.un~
 
 # JetBrains rules
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -311,9 +334,14 @@ tags
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
+# *.iml
+# *.ipr
 
 # CMake
 cmake-build-*/
@@ -363,6 +391,7 @@ fabric.properties
 
 # SFTP configuration file
 sftp-config.json
+sftp-config-alt*.json
 
 # Package control specific files
 Package Control.last-run
@@ -400,6 +429,7 @@ tmtags
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+*.code-workspace
 
 # Xcode rules
 # Xcode
@@ -426,6 +456,9 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 
+## Gcc Patch
+/*.gcno
+
 # Eclipse rules
 .metadata
 bin/
@@ -477,12 +510,17 @@ local.properties
 
 # Annotation Processing
 .apt_generated/
+.apt_generated_test/
 
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
 .worksheet
 
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
 # TortoiseGit rules
 # Project-level settings
 /.tgitconfig

.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,40 +5,25 @@ notifications:
   email: false
 python:
   - 3.7
-  - 2.7
+  - 3.6
 
 stages:
   - lint
   - moban
   - test
 
-.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
 
 .lint: &lint
-  <<: *disable_global
   git:
     submodules: false
   python: 3.6
   stage: lint
   script: make install_test lint
 
 .moban: &moban
-  <<: *disable_global
   python: 3.6
   stage: moban
-  install: pip install moban>=0.0.4
+  install: pip install moban>=0.0.4 gitfs2 pypifs
   script: make upstreaming git-diff-check
 
 jobs:

CHANGELOG.rst

@@ -1,6 +1,21 @@
 Change log
 ================================================================================
 
+ - 
+--------------------------------------------------------------------------------
+
+**Added**
+
+#. add python_requires in setup.py
+#. no code coverage support
+
+0.0.10 - tbd
+--------------------------------------------------------------------------------
+
+**Added**
+
+#. add github star badges
+
 0.0.9 - 13.10.2019
 --------------------------------------------------------------------------------
 

README.rst

@@ -7,10 +7,10 @@ pypi-mobans
 
 .. image:: https://codecov.io/github/moremoban/pypi-mobans/coverage.png
    :target: https://codecov.io/github/moremoban/pypi-mobans
-
-
 .. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
    :target: https://gitter.im/chfw_moban/Lobby
+.. image:: https://img.shields.io/github/stars/moremoban/pypi-mobans.svg?style=social&maxAge=3600&label=Star
+    :target: https://github.com/moremoban/pypi-mobans/stargazers
 
 
 Scaffolding templates for your Python project.

changelog.yml

@@ -1,6 +1,17 @@
 name: pypi-mobans
 organisation: moremoban
 releases:
+  - changes:
+      - action: Added
+        details:
+          - "add python_requires in setup.py"
+          - "no code coverage support"
+  - changes:
+      - action: Added
+        details:
+          - "add github star badges"
+    date: tbd
+    version: 0.0.10
   - changes:
       - action: Added
         details:

templates/badges.rst.jj2

@@ -20,18 +20,23 @@
 {% else %}
 {% set suffix = '/coverage.png' %}
 {% endif %}
+{% if not no_code_coverage %}
 .. image:: https://codecov.io/{{base_path}}{{suffix}}
    :target: https://codecov.io/{{base_path}}
-
+{% endif %}
 {% if release != "0.0.0" %}
 .. image:: https://badge.fury.io/py/{{name}}.svg
    :target: https://pypi.org/project/{{name}}
 
 .. image:: https://pepy.tech/badge/{{name}}/month
    :target: https://pepy.tech/project/{{name}}/month
-{% endif %}
 
+{% endif %}
 {% if gitter_room %}
 .. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
    :target: https://gitter.im/{{gitter_room}}
 {% endif %}
+{% if scm_host == 'github.com' %}
+.. image:: https://img.shields.io/github/stars/{{organisation}}/{{name}}.svg?style=social&maxAge=3600&label=Star
+    :target: https://github.com/{{organisation}}/{{name}}/stargazers
+{% endif %}

templates/gitignore

@@ -177,6 +177,10 @@ CLASSIFIERS = [
     {% endblock %}
 ]
 
+{% if python_requires %}
+PYTHON_REQUIRES = "{{python_requires}}"
+{% endif %}
+
 {%macro handle_complex_dependency(complex_one) -%}
 {%set dependency, condition = complex_one.split(";")%}
 {% if condition == 'python_version<"3"'%}
@@ -426,6 +430,9 @@ if __name__ == "__main__":
 {% if external_module_library %}
         ext_modules=[PYMODULE],
 {% else %}
+{% if python_requires %}
+        python_requires=PYTHON_REQUIRES,
+{% endif %}
         extras_require=EXTRAS_REQUIRE,
         tests_require=["nose"],
         install_requires=INSTALL_REQUIRES,

templates/setup.py.jj2

@@ -3,5 +3,8 @@ mock;python_version<"3"
 codecov
 coverage
 flake8
+{% for dependency in test_dependencies: %}
+{{dependency}}
+{% endfor %}
 {%block extras %}
 {%endblock%}