Merge pull request #85 from moremoban/dev

release 0.0.5

Author: chfw

.gitignore

@@ -25,6 +25,8 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -43,6 +45,7 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
@@ -77,9 +80,20 @@ target/
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
 .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
+#   install all needed dependencies.
+#Pipfile.lock
+
 # celery beat schedule file
 celerybeat-schedule
 
@@ -107,6 +121,11 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
 
 # VirtualEnv rules
 # Virtualenv
@@ -238,6 +257,10 @@ flycheck_*.el
 # directory configuration
 .dir-locals.el
 
+# network security
+/network-security.data
+
+
 # Vim rules
 # Swap
 [._]*.s[a-v][a-z]
@@ -268,6 +291,9 @@ tags
 .idea/**/dictionaries
 .idea/**/shelf
 
+# Generated files
+.idea/**/contentModel.xml
+
 # Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
@@ -281,6 +307,14 @@ tags
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# 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/modules.xml
+# .idea/*.iml
+# .idea/modules
+
 # CMake
 cmake-build-*/
 
@@ -311,6 +345,9 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
 # SublimeText rules
 # Cache files for Sublime Text
 *.tmlanguage.cache
@@ -390,7 +427,6 @@ DerivedData/
 !default.perspectivev3
 
 # Eclipse rules
-
 .metadata
 bin/
 tmp/

.travis.yml

@@ -10,13 +10,36 @@ install:
 stages:
   - test
   - moban
+  - lint
+
+.disable_global: &disable_global
+  before_install: false
+  install: true
+  before_script: false
+  after_success: false
+  after_failure: false
+
+.lint: &lint
+  <<: *disable_global
+  python: 3.6
+  stage: lint
+  install: pip install flake8
+  script: flake8
+
+.moban: &moban
+  <<: *disable_global
+  python: 2.7
+  stage: moban
+  install: pip install moban>=0.0.4
+  script:
+    - make
 
 jobs:
   include:
-    - stage: moban
-      script:
-        - make
-        - git diff --exit-code
+    - *moban
+    - *lint
+  allow_failures:
+    - test
 
 stage: test
 

CHANGELOG.rst

@@ -1,6 +1,16 @@
 Change log
 ================================================================================
 
+0.0.5 - 04-05-2019
+--------------------------------------------------------------------------------
+
+Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. #75: separate flake8 linting in separate travis job
+#. #72: project and copyright are no longer filled.
+#. black style on setup.py, include python 3.7, 3.8 , update gitignore
+
 0.0.4 - 18-02-2019
 --------------------------------------------------------------------------------
 

Makefile

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

changelog.yml

@@ -1,6 +1,14 @@
 name: "pypi-mobans"
 organisation: moremoban
 releases:
+- changes:
+  - action: Updated
+    details:
+    - "#75: separate flake8 linting in separate travis job"
+    - "#72: project and copyright are no longer filled."
+    - "black style on setup.py, include python 3.7, 3.8 , update gitignore"
+  date: 04-05-2019
+  version: 0.0.5
 - changes:
   - action: Updated
     details:

templates/conf.py.jj2

@@ -7,12 +7,8 @@ DESCRIPTION = (
 {% endfor %}
     ''
 )
-{% set project_str = name %}
-{% set copyright_str = '{0} {1}'.format(copyright_year, company) %}
-{% set author_str = author %}
-{% set author = company %}
-{% set version_str = release %}
-{% set release_str = version %}
+{% set project = name %}
+{% set copyright = '{0} {1}'.format(copyright_year, company) %}
 {% if sphinx_extensions %}
 {%   set extensions = sphinx_extensions %}
 {% else %}

templates/docs/Makefile.jj2

@@ -1,9 +1,10 @@
 # Minimal makefile for Sphinx documentation
 #
 
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = {{ rsrcdir }}
 BUILDDIR      = {{ rbuilddir }}
 

templates/gitignore

@@ -0,0 +1 @@
+flake8 . --exclude=.moban.d,docs {%block flake8_options%}--builtins=unicode,xrange,long{%endblock%}