Merge pull request #18 from mkouhei/supports-py38

Supports py38

.travis.yml

@@ -1,6 +1,5 @@
 dist: xenial
 language: python
-sudo: false
 
 install:
   - pip install coveralls tox
@@ -12,6 +11,8 @@ after_success:
 
 matrix:
   include:
+    - python: 3.8
+      env: TOX_ENV=py38
     - python: 3.7
       env: TOX_ENV=py37
   allow_failures:

bootstrap_py/templates/.travis.yml.j2

@@ -1,7 +1,7 @@
 dist: xenial
 language: python
-sudo: false
 env:
+  - TOX_ENV=py38
   - TOX_ENV=py37
 install:
   - pip install coveralls tox
@@ -13,12 +13,12 @@ after_success:
 
 matrix:
   allow_failures:
-    - python: pypy
-      env: TOX_ENV=pypy
-    - python: pypy3.5
+    - python: pypy3
       env: TOX_ENV=pypy3
-    - python: py3.7-dev
-      env: TOX_ENV=py37
+    - python: py3.8-dev
+      env: TOX_ENV=py38
   include:
+    - python: 3.8
+      env: TOX_ENV=py38
     - python: 3.7
       env: TOX_ENV=py37

bootstrap_py/templates/pytest.ini.j2

@@ -1,7 +1,7 @@
 [pytest]
 addopts =
         -v
-        --flakes
+        --flake8
         --random
         --cov {{ module_name }}
         --cov-report=term

bootstrap_py/templates/setup.py.j2

@@ -48,6 +48,7 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]

bootstrap_py/templates/tox.ini.j2

@@ -1,23 +1,25 @@
 [tox]
 envlist =
     py37,
+    py38,
     pycodestyle
     pydocstyle,
     docs
 
 [testenv]
 commands =
+    python -c "import shutil, os.path; shutil.rmtree('_build') if os.path.isdir('_build') else None"
     py.test --pylint --pylint-rcfile={toxinidir}/.pylintrc {{ module_name }}
 
 [py]
 deps=
     pytest-cov
-    pytest-flakes
+    pytest-flake8
     pytest-pylint
     pytest-random
     pytest-remove-stale-bytecode
 
-[pep8]
+[pycodetyle]
 show-source=True
 statistics=True
 exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,setup.py,docs
@@ -27,10 +29,10 @@ deps=
     {[py]deps}
 basepython = python3.7
 
-[testenv:pypy]
+[testenv:py38]
 deps=
     {[py]deps}
-basepython = pypy
+basepython = python3.8
 
 [testenv:pypy3]
 deps=
@@ -41,14 +43,14 @@ basepython = pypy3
 deps=
     {[py]deps}
     pycodestyle
-basepython = python3.7
+basepython = python3.8
 commands = pycodestyle --first
 
 [testenv:pydocstyle]
 deps=
     pydocstyle
 commands = pydocstyle {{ module_name }}
-basepython = python3.7
+basepython = python3.8
 
 [testenv:docs]
 deps=

bootstrap_py/templates/utils/pre-commit.j2

@@ -7,5 +7,5 @@ rootdir=$(git rev-parse --show-toplevel)
     find ./ -name '*.pyc' -delete
     tox
     python setup.py check -r
-    which rst2html && python setup.py --long-description | rst2html > /dev/null
+    which rst2html5.py && python setup.py --long-description | rst2html5.py > /dev/null
 )

docs/source/conf.py

@@ -49,7 +49,7 @@
 
 # General information about the project.
 project = 'bootstrap-py'
-copyright = '2016-2019, Kouhei Maeda <mkouhei@palmtb.net>'
+copyright = '2016-2020, Kouhei Maeda <mkouhei@palmtb.net>'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

pytest.ini

@@ -1,7 +1,7 @@
 [pytest]
 addopts =
         -v
-        --flakes
+        --flake8
         --random
         --cov bootstrap_py
         --cov-report=term

setup.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Copyright (C) 2016-2019 Kouhei Maeda <mkouhei@palmtb.net>
+Copyright (C) 2016-2020 Kouhei Maeda <mkouhei@palmtb.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@ def read_content(filepath):
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development",
     "Topic :: System :: Archiving :: Packaging",

tox.ini

@@ -1,12 +1,14 @@
 [tox]
 envlist =
     py37,
+    py38,
     pycodestyle,
     pydocstyle,
     docs
 
 [testenv]
-commands = 
+commands =
+    python -c "import shutil, os.path; shutil.rmtree('_build') if os.path.isdir('_build') else None"
     py.test --pylint --pylint-rcfile={toxinidir}/.pylintrc
 
 [py]
@@ -16,7 +18,7 @@ deps=
     requests-mock
     pytest-cov
     pycodestyle
-    pytest-flakes
+    pytest-flake8
     pytest-pylint
     pytest-random
     pytest-remove-stale-bytecode
@@ -31,10 +33,10 @@ deps=
     {[py]deps}
 basepython = python3.7
 
-[testenv:pypy]
+[testenv:py38]
 deps=
     {[py]deps}
-basepython = pypy
+basepython = python3.8
 
 [testenv:pypy3]
 deps=
@@ -45,14 +47,14 @@ basepython = pypy3
 deps=
     {[py]deps}
     pycodestyle
-basepython = python3.7
+basepython = python3.8
 commands = pycodestyle --first
 
 [testenv:pydocstyle]
 deps=
     pydocstyle
 commands = pydocstyle bootstrap_py
-basepython = python3.7
+basepython = python3.8
 
 [testenv:docs]
 deps=

utils/pre-commit

@@ -7,5 +7,5 @@ rootdir=$(git rev-parse --show-toplevel)
     find ./ -name '*.pyc' -delete
     tox
     python setup.py check -r
-    which rst2html && python setup.py --long-description | rst2html > /dev/null
+    which rst2html5.py && python setup.py --long-description | rst2html5.py > /dev/null
 )