Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
2 changes: 1 addition & 1 deletion .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,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
18 changes: 9 additions & 9 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ default_section = THIRDPARTY
;no_lines_before=LOCALFOLDER
known_third_party =
coverage
coverage-pyver-pragma
domdf-python-tools
coverage_pyver_pragma
domdf_python_tools
github
jsonpath-ng
jsonpath_ng
jsonschema
pytest
pytest-cov
pytest-randomly
pytest-rerunfailures
pytest-timeout
pytest_cov
pytest_randomly
pytest_rerunfailures
pytest_timeout
pyyaml
requests
strict-rfc3339
typing-extensions
strict_rfc3339
typing_extensions
known_first_party = ytools
remove_redundant_aliases = True
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 @@ -36,7 +36,7 @@ This is a port of the Python 2-only ``ytools`` ( https://github.com/yaccob/ytool
:alt: Docs Check Status

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

.. |actions_windows| image:: https://github.com/domdfcoding/ytools3/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 @@ -10,7 +10,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
tabulate>=0.8.7
Expand Down
1 change: 0 additions & 1 deletion repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ python_versions:
- 'pypy3'

# travis secure password for PyPI
travis_pypi_secure: "H3di2VGPs85E/LHi6031L0eo7BEGs9a36qFEuwOvp0kw2f8ld4zTsu6omgcwg/ea9ljJ401oxgsLp8YkiaXm5W/yDjr2BLWKSHpInCx/4My0r/Wfsvn0SjrzUsjUElGtXZsh5BJbHD1q0ZjXyfeFUDnlX+2IBlS5oDHo7qVUqAP5PJd3zdgo0JMx6sQ91HpQDAZTq7p/pYIF4fhTcoMFtUQkwiGYwERaIRDymsMQKonvk02Rnd0OJI5IhMctis8PvV+jTM7WW/e1V+ggQ1Z1mPqzDtQ+aOaWvCCdK9KiLeZLbfz3Q6Ai0M1wDl2hEjTASPZpGIKs6/W6kYRLN7WTfK4efNTsPjZalbQkPQAv6ylIrOW6C83erGv8qVycuEzjHF9pvdU9ka35Gru24qtLLEkYVsB49zvR6B6gvURS8C9+cNeCfJcrfRvco8w3xofNaSPUsk5+NO7IvORrurMjW2T5Syrqdu3d9vUG8tniNyVz/kMTqg9s7AHEb6XHOkzpPZkmDRhAgfHhTLoSxUR4jF69Kx2xJ7WwndSoA6RIah8P9GeajsxCF0G9gRL10vK8a8meO2uCp2S60Xap7Ri/eNJnPSGn/BtRcLK8IhMixF0G2G9AJ6vkLs8is4NXl/9+VWrl0EL7hak9AY0gvHiOtHNiLhLmMACB+MbbulZB+24="

classifiers:
- 'Development Status :: 4 - Beta'
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
jsonpath-ng>=1.5.1
jsonschema>=3.2.0
PyYAML>=5.1
pyyaml>=5.1
strict-rfc3339==0.7
typing-extensions
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,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, pypy3
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
pypy3: pypy3, build

[gh-actions]
python =
3.6: py36, build, mypy
Expand All @@ -54,9 +45,7 @@ commands =
python -m pytest --cov=ytools -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 @@ -170,6 +159,14 @@ package = ytools
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
pypy3: pypy3, build

[testenv:yapf]
basepython = python3.7
changedir = {toxinidir}
Expand Down
2 changes: 2 additions & 0 deletions ytools/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# this package
from ytools import __version__, dump, optiondefaults, validate

__all__ = ["main"]


def main(argv):
parser = argparse.ArgumentParser(
Expand Down