diff --git a/.moban.cd/moban.yml b/.moban.cd/moban.yml index 2585b9f1..a3709bb3 100644 --- a/.moban.cd/moban.yml +++ b/.moban.cd/moban.yml @@ -21,9 +21,9 @@ dependencies: - ruamel.yaml>=0.15.5 - jinja2>=2.7.1 - lml>=0.0.9 - - appdirs==1.4.3 - - crayons - - GitPython==2.1.11 - - giturlparse + - appdirs>=1.2.0 + - crayons>= 0.1.0 + - GitPython>=2.0.0 + - giturlparse>=0.9.1 description: Yet another jinja2 cli command for static text generation scm_host: github.com diff --git a/.moban.d/travis.yml b/.moban.d/travis.yml index 3408a1ba..741fd994 100644 --- a/.moban.d/travis.yml +++ b/.moban.d/travis.yml @@ -1,9 +1,17 @@ {% extends 'travis.yml.jj2' %} +{%block extra_matrix %} +matrix: + include: + - python: 2.7 + env: MINREQ=1 +{%endblock%} + {%block custom_python_versions%} python: - - pypy-5.3.1 - - 3.7-dev + - &pypy2 pypy2.7-6.0 + - 3.8-dev + - 3.7 - 3.6 - 3.5 - 2.7 diff --git a/.travis.yml b/.travis.yml index 16330f5a..3fa8fc09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,19 @@ sudo: false +dist: xenial language: python notifications: email: false python: - - pypy-5.3.1 - - 3.7-dev + - &pypy2 pypy2.7-6.0 + - 3.8-dev + - 3.7 - 3.6 - 3.5 - 2.7 +matrix: + include: + - python: 2.7 + env: MINREQ=1 before_install: - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then diff --git a/docs/conf.py b/docs/conf.py index ce8629fe..3d501aee 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,13 +24,11 @@ project = 'moban' copyright = '2017-2019 Onni Software Ltd. and its contributors' author = 'Onni Software Ltd.' - # The short X.Y version version = '0.4.0' # The full version, including alpha/beta/rc tags release = '0.4.0' - # -- General configuration --------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be @@ -41,15 +39,6 @@ # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] -# The suffix(es) of source filenames. -# You can specify multiple suffix as a list of string: -# -# source_suffix = ['.rst', '.md'] -source_suffix = '.rst' - -# The master toctree document. -master_doc = 'index' - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # @@ -70,51 +59,16 @@ # html_theme = 'alabaster' -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -# -# html_theme_options = {} - # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] -# Custom sidebar templates, must be a dictionary that maps document names -# to template names. -# -# The default sidebars (for documents that don't match any pattern) are -# defined by theme itself. Builtin themes are using these templates by -# default: ``['localtoc.html', 'relations.html', 'sourcelink.html', -# 'searchbox.html']``. -# -# html_sidebars = {} - - -# -- Options for Epub output ------------------------------------------------- - -# Bibliographic Dublin Core info. -epub_title = project - -# The unique identifier of the text. This can be a ISBN number -# or the project homepage. -# -# epub_identifier = '' - -# A unique identification for the text. -# -# epub_uid = '' - -# A list of files that should not be packed into the epub file. -epub_exclude_files = ['search.html'] - # -- Extension configuration ------------------------------------------------- # -- Options for intersphinx extension --------------------------------------- # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = {'https://docs.python.org/': None} - # TODO: html_theme not configurable upstream html_theme = 'default' diff --git a/min_requirements.txt b/min_requirements.txt new file mode 100644 index 00000000..3f7c2ca6 --- /dev/null +++ b/min_requirements.txt @@ -0,0 +1,7 @@ +ruamel.yaml==0.15.5 +jinja2==2.7.1 +lml==0.0.9 +appdirs==1.2.0 +crayons== 0.1.0 +GitPython==2.0.0 +giturlparse==0.9.1 diff --git a/mobanfile b/mobanfile index 36728477..9ba1533f 100644 --- a/mobanfile +++ b/mobanfile @@ -16,3 +16,4 @@ targets: - output: CHANGELOG.rst configuration: changelog.yml template: CHANGELOG.rst.jj2 + - min_requirements.txt: min_requirements.txt.jj2 diff --git a/requirements.txt b/requirements.txt index d3fe44bb..7dd42624 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ruamel.yaml>=0.15.5 jinja2>=2.7.1 lml>=0.0.9 -appdirs==1.4.3 -crayons -GitPython==2.1.11 -giturlparse +appdirs>=1.2.0 +crayons>= 0.1.0 +GitPython>=2.0.0 +giturlparse>=0.9.1 diff --git a/setup.py b/setup.py index bc9f24a6..5f92eb45 100644 --- a/setup.py +++ b/setup.py @@ -65,10 +65,10 @@ 'ruamel.yaml>=0.15.5', 'jinja2>=2.7.1', 'lml>=0.0.9', - 'appdirs==1.4.3', - 'crayons', - 'GitPython==2.1.11', - 'giturlparse', + 'appdirs>=1.2.0', + 'crayons>= 0.1.0', + 'GitPython>=2.0.0', + 'giturlparse>=0.9.1', ] SETUP_COMMANDS = {} @@ -189,6 +189,7 @@ def filter_out_test_code(file_handle): if __name__ == '__main__': setup( + test_suite="tests", name=NAME, author=AUTHOR, version=VERSION, diff --git a/tests/mobanfile/test_templates.py b/tests/mobanfile/test_templates.py index 620e4e12..1379f88e 100644 --- a/tests/mobanfile/test_templates.py +++ b/tests/mobanfile/test_templates.py @@ -59,7 +59,8 @@ def test_listing_dir_recusively(self): None, ), ] - eq_(expected, results) + eq_(sorted(expected, key=lambda x: x[0]), + sorted(results, key=lambda x: x[0])) @patch("moban.reporter.report_error_message") def test_listing_dir_recusively_with_error(self, reporter):