Skip to content

Commit 2c5a676

Browse files
repo-helper[bot]domdfcoding
authored andcommitted
Updated files with 'repo_helper'. (#42)
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
1 parent 26bb26e commit 2c5a676

File tree

10 files changed

+29
-15
lines changed

10 files changed

+29
-15
lines changed

.bumpversion.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ replace = current_version="{new_version}"
2222
[bumpversion:file:pyproject.toml]
2323
search = version = "{current_version}"
2424
replace = version = "{new_version}"
25+
26+
[bumpversion:file:.github/workflows/conda_ci.yml]

.github/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exemptMilestones: false
2828
exemptAssignees: false
2929

3030
# Label to use when marking as stale
31-
staleLabel: wontfix
31+
staleLabel: stale
3232

3333
# Comment to post when marking as stale. Set to `false` to disable
3434
markComment: >

.github/workflows/conda_ci.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,22 @@ jobs:
3636
$CONDA/bin/conda config --add channels conda-forge
3737
$CONDA/bin/conda config --add channels domdfcoding
3838
39-
- name: "Build and install package"
39+
- name: "Build and index channel"
4040
run: |
41-
# This mess is only necessary because conda won't fix it themselves
42-
# https://github.com/conda/conda/issues/1884
43-
4441
python -m repo_helper build --conda --out-dir conda-bld/noarch
4542
$CONDA/bin/conda index ./conda-bld || exit 1
46-
$CONDA/bin/conda install -c file://$(pwd)/conda-bld consolekit -y || exit 1
43+
44+
- name: "Search for package"
45+
run: |
46+
$CONDA/bin/conda search -c file://$(pwd)/conda-bld consolekit
47+
$CONDA/bin/conda search -c file://$(pwd)/conda-bld --override-channels consolekit
48+
49+
- name: "Install package"
50+
run: |
51+
$CONDA/bin/conda install -c file://$(pwd)/conda-bld consolekit=1.2.2=py_1 -y || exit 1
52+
53+
- name: "Run Tests"
54+
run: |
55+
rm -rf consolekit
56+
$CONDA/bin/pip install -r tests/requirements.txt
57+
$CONDA/bin/pytest tests/

.github/workflows/python_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: "windows-2019"
1616
continue-on-error: ${{ matrix.config.experimental }}
1717
env:
18-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.1,pypy-3.6,pypy-3.7'
18+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7'
1919

2020
strategy:
2121
fail-fast: False
@@ -25,7 +25,7 @@ jobs:
2525
- {python-version: "3.7", testenvs: "py37-click{7.1,8.0},build", experimental: False}
2626
- {python-version: "3.8", testenvs: "py38-click{7.1,8.0},build", experimental: False}
2727
- {python-version: "3.9", testenvs: "py39-click{7.1,8.0},build", experimental: False}
28-
- {python-version: "3.10.0-beta.1", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
28+
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
2929
- {python-version: "pypy-3.6", testenvs: "pypy36-click{7.1,8.0},build", experimental: False}
3030
- {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0},build", experimental: True}
3131

.github/workflows/python_ci_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: "ubuntu-20.04"
1616
continue-on-error: ${{ matrix.config.experimental }}
1717
env:
18-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.1,pypy-3.6,pypy-3.7'
18+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7'
1919

2020
strategy:
2121
fail-fast: False
@@ -25,7 +25,7 @@ jobs:
2525
- {python-version: "3.7", testenvs: "py37-click{7.1,8.0},build", experimental: False}
2626
- {python-version: "3.8", testenvs: "py38-click{7.1,8.0},build", experimental: False}
2727
- {python-version: "3.9", testenvs: "py39-click{7.1,8.0},build", experimental: False}
28-
- {python-version: "3.10.0-beta.1", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
28+
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
2929
- {python-version: "pypy-3.6", testenvs: "pypy36-click{7.1,8.0},build", experimental: False}
3030
- {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0},build", experimental: True}
3131

.github/workflows/python_ci_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: "macos-latest"
1616
continue-on-error: ${{ matrix.config.experimental }}
1717
env:
18-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.1,pypy-3.6,pypy-3.7'
18+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7'
1919

2020
strategy:
2121
fail-fast: False
@@ -25,7 +25,7 @@ jobs:
2525
- {python-version: "3.7", testenvs: "py37-click{7.1,8.0},build", experimental: False}
2626
- {python-version: "3.8", testenvs: "py38-click{7.1,8.0},build", experimental: False}
2727
- {python-version: "3.9", testenvs: "py39-click{7.1,8.0},build", experimental: False}
28-
- {python-version: "3.10.0-beta.1", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
28+
- {python-version: "3.10.0-beta.3", testenvs: "py310-dev-click{7.1,8.0},build", experimental: True}
2929
- {python-version: "pypy-3.6", testenvs: "pypy36-click{7.1,8.0},build", experimental: False}
3030
- {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0},build", experimental: True}
3131

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exclude: ^$
55

66
repos:
77
- repo: https://github.com/repo-helper/pyproject-parser
8-
rev: v0.2.3
8+
rev: v0.3.0
99
hooks:
1010
- id: reformat-pyproject
1111

@@ -73,7 +73,7 @@ repos:
7373
- id: forbid-crlf
7474

7575
- repo: https://github.com/repo-helper/formate
76-
rev: v0.4.5
76+
rev: v0.4.6
7777
hooks:
7878
- id: formate
7979
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$

formate.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ known_third_party = [
4343
"github",
4444
"importlib_metadata",
4545
"mistletoe",
46+
"mypy",
4647
"pytest",
4748
"pytest_cov",
4849
"pytest_mypy_plugins",

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ extensions = [
5252
"sphinx_toolbox.tweaks.latex_toc",
5353
"sphinx.ext.intersphinx",
5454
"sphinx.ext.mathjax",
55-
"sphinxcontrib.httpdomain",
5655
"sphinxcontrib.extras_require",
5756
"sphinx.ext.todo",
5857
"sphinxemoji.sphinxemoji",

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ deps =
100100
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
101101
pydocstyle>=6.0.0
102102
pygments>=2.7.1
103+
importlib_metadata<4.5.0; python_version<'3.8'
103104
commands = python3 -m flake8_rst_docstrings_sphinx consolekit tests --allow-toolbox {posargs}
104105

105106
[testenv:mypy]

0 commit comments

Comments
 (0)