Skip to content

Commit

Permalink
Merge 9c19ef3 into 2a49f43
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Nov 23, 2020
2 parents 2a49f43 + 9c19ef3 commit d79f898
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 28 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file is managed by 'repo_helper'. Don't edit it directly.
---
name: Artefact Cleaner
on:
schedule:
- cron: 0 9 1 * *
jobs:
Clean:
runs-on: ubuntu-latest
steps:
- name: cleanup
uses: glassechidna/artifact-cleaner@v2
with:
minimumAge: 1000000.0
3 changes: 2 additions & 1 deletion .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- name: "Run Tests for Python ${{ matrix.python-version }}"
run: "python -m tox"


- name: "Upload Coverage"
uses: actions/upload-artifact@v2
with:
Expand Down Expand Up @@ -75,7 +76,7 @@ jobs:
shopt -s globstar
python -m coverage combine coverage/**/.coverage
- name: "Upload Combined Coverage Aretfact"
- name: "Upload Combined Coverage Artefact"
uses: actions/upload-artifact@v2
with:
name: "combined-coverage"
Expand Down
12 changes: 6 additions & 6 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ known_third_party =
click
consolekit
coverage
coverage-pyver-pragma
domdf-python-tools
coverage_pyver_pragma
domdf_python_tools
github
pytest
pytest-cov
pytest-randomly
pytest-timeout
repo-helper
pytest_cov
pytest_randomly
pytest_timeout
repo_helper
requests
virtualenv
known_first_party = repo_helper_devenv
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ repos:
- id: forbid-crlf

- repo: https://github.com/domdfcoding/yapf-isort
rev: v0.5.2
rev: v0.5.4
hooks:
- id: yapf-isort
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$

- repo: https://github.com/domdfcoding/dep_checker
rev: v0.3.1
rev: v0.4.1
hooks:
- id: dep_checker
args:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ repo_helper_devenv
:alt: Docs Check Status

.. |travis| image:: https://github.com/domdfcoding/repo_helper_devenv/workflows/Linux%20Tests/badge.svg
:target: https://github.com/domdfcoding/repo_helper_devenv/actions?query=workflow%3A%Linux+Tests%22
:target: https://github.com/domdfcoding/repo_helper_devenv/actions?query=workflow%3A%22Linux+Tests%22
:alt: Linux Test Status

.. |actions_windows| image:: https://github.com/domdfcoding/repo_helper_devenv/workflows/Windows%20Tests/badge.svg
Expand Down
2 changes: 1 addition & 1 deletion doc-source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sphinx-copybutton>=0.2.12
sphinx-notfound-page>=0.5
sphinx-prompt>=1.1.0
sphinx-tabs>=1.1.13
sphinx-toolbox>=1.7.3
sphinx-toolbox>=1.7.5
sphinxcontrib-httpdomain>=1.7.0
sphinxemoji>=0.1.6
toctree-plus>=0.0.4
3 changes: 0 additions & 3 deletions repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ python_versions:
extra_sphinx_extensions:
- sphinx_click

travis_pypi_secure: "Ve347lvfcmdZUwa8/F+nYCs6Lturm2cwFz7+wCsFY4befcyDz0NEfq8CbTiy+rD7e7rUp46i2dCb35r8GbP+U8pyxzgUprTMNzmkVsTqttrzcdrFgUhJCb5vqKix7rSjIqXEY2a8PHUn1lOpilyARwQLBNoxEVGc2Sj23YwVOPTQq8uXZaF7zCZLnEdtNGEjfxIvZ1s2L03bXLpTwrIVUrGk4X3YefgnlCdPn+B+WV7qWWLsYhGuSePuhWXwqNP4dDRmXV+3hoOktg8pUqTs/AfA8VVbZgbDWdyRzDDRSfOt9OKuVi/5aA7OYAkLL74dW2+sWeLFgCZ8Nz6IgtUafcSKtRssszGd/AEE6e5NR6vVP7NBlN8MigRI2WQDz3t4qmexkQOt8dusf5d1r8+d958atFCQQ3knP5j5AgohdsY5niIyJLfsMvzSCQqYjZaLpkYLaLwHsa6iye1yvUQhQrdLowAhy7Mg7M6hImWie4UzaqVjpNXaWUtyxW4Up34aC0VzQKq2Nbm0bwLWHKCs8ItNYUHbnDk1EFdmDkE5BKziR+5izIZERFU6c3b5LnHIYStxJa7c45tANCDeiXgFokM8croaqpZ+2xam1OCJ5jsnsCDRUqeqTAY0bl2lk1dgsZLreTzbJYovLqvvJqzd9WbvgPXaZkymVLRhcnRDY2w="

sphinx_html_theme: furo

standalone_contrib_guide: true

use_travis: false
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: Implementation :: CPython
Typing :: Typed

Expand All @@ -41,9 +41,9 @@ packages = find:

[options.packages.find]
exclude =
doc-source
tests
tests.*
doc-source

[mypy]
python_version = 3.6
Expand Down
21 changes: 9 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# You may add new sections, but any changes made to the following sections will be lost:
# * tox
# * envlists
# * travis
# * gh-actions
# * testenv
# * testenv:docs
Expand All @@ -28,14 +27,6 @@ test = py36, py37, py38, py39, py310-dev
qa = mypy, lint
cov = py36, coverage

[travis]
python =
3.6: py36, build, mypy
3.7: py37, build
3.8: py38, build
3.9: py39, build
3.10-dev: py310-dev, build

[gh-actions]
python =
3.6: py36, build, mypy
Expand All @@ -54,9 +45,7 @@ commands =
python -m pytest --cov=repo_helper_devenv -r aR tests/ {posargs}

[testenv:docs]
setenv =
SHOW_TODOS = 1
PIP_USE_FEATURE = 2020-resolver
setenv = SHOW_TODOS = 1
basepython = python3.8
changedir = {toxinidir}/doc-source
deps =
Expand Down Expand Up @@ -171,6 +160,14 @@ package = repo_helper_devenv
addopts = --color yes --durations 25
timeout = 300
[travis]
python =
3.6: py36, build, mypy
3.7: py37, build
3.8: py38, build
3.9: py39, build
3.10-dev: py310-dev, build
[testenv:yapf]
basepython = python3.7
changedir = {toxinidir}
Expand Down

0 comments on commit d79f898

Please sign in to comment.