Skip to content

Commit

Permalink
Updated files with 'repo_helper'. (#3)
Browse files Browse the repository at this point in the history
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
  • Loading branch information
repo-helper[bot] committed Nov 23, 2020
1 parent 470b446 commit 5123528
Show file tree
Hide file tree
Showing 13 changed files with 90 additions and 84 deletions.
26 changes: 0 additions & 26 deletions .ci/actions_build_conda.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .ci/actions_deploy_conda.sh

This file was deleted.

24 changes: 24 additions & 0 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
# This file is managed by 'repo_helper'. Don't edit it directly.

set -e -x

python -m repo_helper make-recipe || exit 1

# Switch to miniconda
source "/home/runner/miniconda/etc/profile.d/conda.sh"
hash -r
conda activate base
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda install conda-build
conda install anaconda-client
conda info -a

conda config --add channels domdfcoding || exit 1

conda config --add channels conda-forge || exit 1

conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing

exit 0
24 changes: 24 additions & 0 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
# This file is managed by 'repo_helper'. Don't edit it directly.

set -e -x

# Switch to miniconda
source "/home/runner/miniconda/etc/profile.d/conda.sh"
hash -r
conda activate base
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda install anaconda-client
conda info -a

for f in conda/dist/noarch/toctree_plus-*.tar.bz2; do
[ -e "$f" ] || continue
echo "$f"
conda install "$f" || exit 1
echo "Deploying to Anaconda.org..."
anaconda -t "$ANACONDA_TOKEN" upload "$f" || exit 1
echo "Successfully deployed to Anaconda.org."
done

exit 0
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
10 changes: 5 additions & 5 deletions .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 Expand Up @@ -143,13 +143,13 @@ jobs:
- name: Build Conda 📦
run: |
chmod +x .ci/actions_build_conda.sh
bash .ci/actions_build_conda.sh
chmod +x .github/actions_build_conda.sh
bash .github/actions_build_conda.sh
- name: Deploy Conda 🚀
if: startsWith(github.ref, 'refs/tags/')
run: |
chmod +x .ci/actions_deploy_conda.sh
bash .ci/actions_deploy_conda.sh
chmod +x .github/actions_deploy_conda.sh
bash .github/actions_deploy_conda.sh
env:
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
16 changes: 8 additions & 8 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ default_section = THIRDPARTY
known_third_party =
beautifulsoup4
coverage
coverage-pyver-pragma
coverage_pyver_pragma
docutils
domdf-python-tools
domdf_python_tools
github
html5lib
packaging
pytest
pytest-cov
pytest-randomly
pytest-regressions
pytest-rerunfailures
pytest-timeout
pytest_cov
pytest_randomly
pytest_regressions
pytest_rerunfailures
pytest_timeout
pytoml
pytz
requests
setuptools
sphinx
sphinx-toolbox
sphinx_toolbox
known_first_party = sphinxcontrib.toctree_plus
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 @@
:alt: Docs Check Status

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

.. |actions_windows| image:: https://github.com/domdfcoding/toctree_plus/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 @@ -8,7 +8,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
1 change: 0 additions & 1 deletion repo_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ python_versions:
- '3.10-dev'

# travis secure password for PyPI
travis_pypi_secure: "RQ7OMMqX1798qCLL6xRVcLzo+iGAYLMZO3Uren4ciho1zSD9YeKUCVmjMIbv9Tyqsip8tZhVW/bFg+kmIecWFto7qP7yf3+jgcusriXxJGQLXtX6WJFuSESKFTHVCHZ6e9BhaSM1qeCUJYpUKbiZn8BiWrBZxdAFl+sEjTxkgZt84arUGSMouxFqsNcikT9reyFvhZ+npC6Vv2Dwa9IyEUKtXZ3j/XG9D6k1KOuh64DtPVlJAqQEPWVbRczoP4+gegrtvX9479h1D+ykoAVD1lTTkjsCglFFU24wpmovyzaQaarbL0G8/aTNZRHZXYN1c+mrTIeCwrFg4KCT3rkrWW4zM3TJSV9JmL1nd2gkhuK2sK3oeR7uxVHRSKeqUlmSzlzNXlLrOA6eovFIiKR8HVhlTcdL8UOqE3HCrPa2SwxYQ8ae+X8foeZQvFlPsUyjpmOApwHHThyuD1egbXcpvzIBM9Fk7Du8GW4QE9zHwNLoAG31jtMIKXN84EG3IzW2mXHq+YK4tSl6DvLwZvKL2sFGEZTyL0rbPFVLlZtNoF5PmC9F4wQY6a5fM27bqMsREhGsZfYd33GRjFAxY2rYWYTddrPeBBKEvNEq4QifjkNGodD/YuYWs7M6bmELyv5Vpw3wa2vutw8q51DbyW1QbkkEP6tFq5lhv9GvXlgjsvg="

classifiers:
- 'Development Status :: 4 - Beta'
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,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
Topic :: Documentation
Topic :: Documentation :: Sphinx
Expand All @@ -49,9 +49,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=sphinxcontrib.toctree_plus -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 = sphinxcontrib
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 5123528

Please sign in to comment.