Skip to content

Commit

Permalink
Updated files with 'repo_helper'.
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Jul 19, 2021
1 parent 6539a1f commit 821bb78
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 23 deletions.
2 changes: 0 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ tag = True

[bumpversion:file:repo_helper.yml]

[bumpversion:file:__pkginfo__.py]

[bumpversion:file:README.rst]

[bumpversion:file:doc-source/index.rst]
Expand Down
5 changes: 2 additions & 3 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ 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 install conda=4.8.5 conda-build=3.18.11
conda info -a

conda config --add channels conda-forge || exit 1
conda config --add channels domdfcoding || exit 1
conda config --remove channels defaults

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

Expand Down
3 changes: 1 addition & 2 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ 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 install conda=4.8.5 anaconda-client
conda info -a

for f in conda/dist/noarch/configconfig-*.tar.bz2; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
tests:
name: "Conda"
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

steps:
- name: Checkout 🛎️
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
---
name: "Docs Check"
on:
- push
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
contents: read
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: Flake8

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
contents: read
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: mypy

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
contents: read
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ name: Windows

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'

pull_request:

permissions:
actions: write
Expand All @@ -15,7 +20,7 @@ jobs:
runs-on: "windows-2019"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4'

strategy:
fail-fast: False
Expand All @@ -25,7 +30,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ name: Linux

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
tags:
- '*'
pull_request:

permissions:
actions: write
Expand All @@ -15,7 +21,7 @@ jobs:
runs-on: "ubuntu-20.04"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4'

strategy:
fail-fast: False
Expand All @@ -25,7 +31,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down Expand Up @@ -150,7 +156,7 @@ jobs:

Conda:
needs: deploy
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-18.04"
if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
steps:
- name: Checkout 🛎️
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ name: macOS

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'

pull_request:

permissions:
actions: write
Expand All @@ -15,7 +20,7 @@ jobs:
runs-on: "macos-latest"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4'

strategy:
fail-fast: False
Expand All @@ -25,7 +30,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
6 changes: 1 addition & 5 deletions __pkginfo__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@
# This script based on https://github.com/rocky/python-uncompyle6/blob/master/__pkginfo__.py
#

__all__ = [
"__version__",
"extras_require",
]
__all__ = ["extras_require"]

__version__ = "0.6.0"
extras_require = {
"sphinx": ["docutils", "sphinx<3.4.0,>=3.0.3", "sphinx-toolbox"],
"testing": ["pytest"],
Expand Down
3 changes: 1 addition & 2 deletions doc-source/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
git+https://github.com/sphinx-toolbox/sphinx-toolbox-experimental.git
autodocsumm>=0.2.0
default-values>=0.5.0
domdf-sphinx-theme>=0.3.0
extras-require>=0.2.0
Expand All @@ -11,7 +10,7 @@ sphinx-notfound-page>=0.5
sphinx-prompt>=1.1.0
sphinx-pyproject>=0.1.0
sphinx-tabs>=1.1.13
sphinx-toolbox>=2.10.0
sphinx-toolbox>=2.13.0
sphinxcontrib-httpdomain>=1.7.0
sphinxemoji>=0.1.6
toctree-plus>=0.5.0

0 comments on commit 821bb78

Please sign in to comment.