Compare commits

..

No commits in common. "56289ab75d42207e007c4524c282221cb2653606" and "9d87aab61b1fdd64e099265c7675f497da7266ac" have entirely different histories.

3 changed files with 66 additions and 60 deletions

View File

@ -1,37 +1,41 @@
# #
# This file is autogenerated by pip-compile with python 3.10 # This file is autogenerated by pip-compile with python 3.8
# To update, run: # To update, run:
# #
# pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in # pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
# #
attrs==21.4.0 attrs==21.2.0
# via pytest # via pytest
backports.entry-points-selectable==1.1.0
# via virtualenv
backports.zoneinfo==0.2.1
# via tzlocal
bandit==1.6.2 bandit==1.6.2
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
bleach==4.1.0 bleach==4.1.0
# via mdx-linkify # via mdx-linkify
certifi==2021.10.8 certifi==2021.5.30
# via requests # via requests
charset-normalizer==2.0.10 charset-normalizer==2.0.6
# via requests # via requests
click==8.0.3 click==8.0.1
# via # via
# flask # flask
# pip-tools # pip-tools
# safety # safety
coverage[toml]==6.2 coverage[toml]==6.0.1
# via pytest-cov # via pytest-cov
distlib==0.3.4 distlib==0.3.3
# via virtualenv # via virtualenv
dlint==0.12.0 dlint==0.11.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
dparse==0.5.1 dparse==0.5.1
# via safety # via safety
filelock==3.4.2 filelock==3.3.0
# via # via
# tox # tox
# virtualenv # virtualenv
flake8==4.0.1 flake8==3.9.2
# via # via
# -r requirements/requirements-dev.in # -r requirements/requirements-dev.in
# dlint # dlint
@ -50,7 +54,7 @@ flake8-executable==2.1.1
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
flake8-fixme==1.1.1 flake8-fixme==1.1.1
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
flake8-isort==4.1.1 flake8-isort==4.0.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
flake8-logging-format==0.6.0 flake8-logging-format==0.6.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
@ -58,21 +62,21 @@ flake8-mutable==1.2.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
flask==2.0.2 flask==2.0.2
# via -r requirements/requirements.in # via -r requirements/requirements.in
gitdb==4.0.9 gitdb==4.0.7
# via gitpython # via gitpython
gitpython==3.1.26 gitpython==3.1.24
# via bandit # via bandit
idna==3.3 idna==3.2
# via requests # via requests
iniconfig==1.1.1 iniconfig==1.1.1
# via pytest # via pytest
isort==5.10.1 isort==5.9.3
# via flake8-isort # via flake8-isort
itsdangerous==2.0.1 itsdangerous==2.0.1
# via flask # via flask
jinja2==3.0.3 jinja2==3.0.2
# via flask # via flask
markdown==3.3.6 markdown==3.3.4
# via # via
# -r requirements/requirements.in # -r requirements/requirements.in
# mdx-linkify # mdx-linkify
@ -82,38 +86,38 @@ mccabe==0.6.1
# via flake8 # via flake8
mdx-linkify==2.1 mdx-linkify==2.1
# via -r requirements/requirements.in # via -r requirements/requirements.in
packaging==21.3 packaging==21.0
# via # via
# bleach # bleach
# dparse # dparse
# pytest # pytest
# safety # safety
# tox # tox
pbr==5.8.0 pbr==5.6.0
# via stevedore # via stevedore
pep517==0.12.0 pep517==0.11.0
# via pip-tools # via pip-tools
pip-tools==6.4.0 pip-tools==6.3.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
platformdirs==2.4.1 platformdirs==2.4.0
# via virtualenv # via virtualenv
pluggy==1.0.0 pluggy==1.0.0
# via # via
# pytest # pytest
# tox # tox
py==1.11.0 py==1.10.0
# via # via
# pytest # pytest
# tox # tox
pycodestyle==2.8.0 pycodestyle==2.7.0
# via flake8 # via flake8
pydocstyle==6.1.1 pydocstyle==6.1.1
# via flake8-docstrings # via flake8-docstrings
pydot==1.4.2 pydot==1.4.2
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
pyflakes==2.4.0 pyflakes==2.3.1
# via flake8 # via flake8
pyparsing==3.0.6 pyparsing==2.4.7
# via # via
# packaging # packaging
# pydot # pydot
@ -123,13 +127,11 @@ pytest==6.2.5
# pytest-cov # pytest-cov
pytest-cov==3.0.0 pytest-cov==3.0.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
pytz-deprecation-shim==0.1.0.post0 pyyaml==5.4.1
# via tzlocal
pyyaml==6.0
# via # via
# bandit # bandit
# dparse # dparse
requests==2.27.1 requests==2.26.0
# via safety # via safety
safety==1.10.3 safety==1.10.3
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
@ -139,11 +141,11 @@ six==1.16.0
# bleach # bleach
# tox # tox
# virtualenv # virtualenv
smmap==5.0.0 smmap==4.0.0
# via gitdb # via gitdb
snowballstemmer==2.2.0 snowballstemmer==2.1.0
# via pydocstyle # via pydocstyle
stevedore==3.5.0 stevedore==3.4.0
# via bandit # via bandit
testfixtures==6.18.3 testfixtures==6.18.3
# via flake8-isort # via flake8-isort
@ -152,31 +154,31 @@ toml==0.10.2
# dparse # dparse
# pytest # pytest
# tox # tox
tomli==2.0.0 tomli==1.2.1
# via # via
# coverage # coverage
# pep517 # pep517
tox==3.24.5 tox==3.24.4
# via # via
# -r requirements/requirements-dev.in # -r requirements/requirements-dev.in
# tox-wheel # tox-wheel
tox-wheel==0.7.0 tox-wheel==0.6.0
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
tzdata==2021.5 typing-extensions==3.10.0.2
# via pytz-deprecation-shim # via gitpython
tzlocal==4.1 tzlocal==3.0
# via -r requirements/requirements.in # via -r requirements/requirements.in
urllib3==1.26.8 urllib3==1.26.7
# via requests # via requests
versioneer==0.21 versioneer==0.20
# via -r requirements/requirements-dev.in # via -r requirements/requirements-dev.in
virtualenv==20.13.0 virtualenv==20.8.1
# via tox # via tox
webencodings==0.5.1 webencodings==0.5.1
# via bleach # via bleach
werkzeug==2.0.2 werkzeug==2.0.2
# via flask # via flask
wheel==0.37.1 wheel==0.37.0
# via # via
# pip-tools # pip-tools
# tox-wheel # tox-wheel

View File

@ -1,20 +1,22 @@
# #
# This file is autogenerated by pip-compile with python 3.10 # This file is autogenerated by pip-compile with python 3.8
# To update, run: # To update, run:
# #
# pip-compile --output-file=requirements/requirements.txt requirements/requirements.in # pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
# #
backports.zoneinfo==0.2.1
# via tzlocal
bleach==4.1.0 bleach==4.1.0
# via mdx-linkify # via mdx-linkify
click==8.0.3 click==8.0.1
# via flask # via flask
flask==2.0.2 flask==2.0.2
# via -r requirements/requirements.in # via -r requirements/requirements.in
itsdangerous==2.0.1 itsdangerous==2.0.1
# via flask # via flask
jinja2==3.0.3 jinja2==3.0.2
# via flask # via flask
markdown==3.3.6 markdown==3.3.4
# via # via
# -r requirements/requirements.in # -r requirements/requirements.in
# mdx-linkify # mdx-linkify
@ -22,17 +24,13 @@ markupsafe==2.0.1
# via jinja2 # via jinja2
mdx-linkify==2.1 mdx-linkify==2.1
# via -r requirements/requirements.in # via -r requirements/requirements.in
packaging==21.3 packaging==21.0
# via bleach # via bleach
pyparsing==3.0.6 pyparsing==2.4.7
# via packaging # via packaging
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
six==1.16.0 six==1.16.0
# via bleach # via bleach
tzdata==2021.5 tzlocal==3.0
# via pytz-deprecation-shim
tzlocal==4.1
# via -r requirements/requirements.in # via -r requirements/requirements.in
webencodings==0.5.1 webencodings==0.5.1
# via bleach # via bleach

18
tox.ini
View File

@ -4,7 +4,7 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = begin,py38,py39,py310,coverage,security,lint,bundle envlist = begin,py37,py38,py39,coverage,security,lint,bundle
[testenv] [testenv]
# build a wheel and test it # build a wheel and test it
@ -31,6 +31,11 @@ deps = setuptools
skip_install = true skip_install = true
commands = coverage erase commands = coverage erase
[testenv:py37]
# run pytest with coverage
commands =
pytest --cov-append --cov={envsitepackagesdir}/incorporealcms/ --cov-branch
[testenv:py38] [testenv:py38]
# run pytest with coverage # run pytest with coverage
commands = commands =
@ -41,11 +46,6 @@ commands =
commands = commands =
pytest --cov-append --cov={envsitepackagesdir}/incorporealcms/ --cov-branch pytest --cov-append --cov={envsitepackagesdir}/incorporealcms/ --cov-branch
[testenv:py310]
# run pytest with coverage
commands =
pytest --cov-append --cov={envsitepackagesdir}/incorporealcms/ --cov-branch
[testenv:coverage] [testenv:coverage]
# report on coverage runs from above # report on coverage runs from above
skip_install = true skip_install = true
@ -80,6 +80,12 @@ source =
[coverage:run] [coverage:run]
branch = True branch = True
# redundant with pytest --cov above, but this tricks the coverage.xml report into
# using the full path, otherwise files with the same name in different paths
# get clobbered. maybe appends would fix this, IDK
include =
.tox/**/incorporealcms/
omit = omit =
**/_version.py **/_version.py