Skip to content

Commit adccfb6

Browse files
committed
Update setup changelog
Signed-off-by: Bernát Gábor <[email protected]>
1 parent ad97564 commit adccfb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+418
-233
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Contributing to ``tox``
1+
# Contributing to `tox`
22

3-
Thank you for your interest in contributing to ``tox``! There are many ways to contribute, and we appreciate all of them.
3+
Thank you for your interest in contributing to `tox`! There are many ways to contribute, and we appreciate all of them.
44
As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
55

66
[coc]: https://www.pypa.io/en/latest/code-of-conduct/
77

88
## Development Documentation
99

1010
Our [development documentation](http://tox.readthedocs.org/en/latest/development.html#development) contains details on
11-
how to get started with contributing to ``tox``, and details of our development processes.
11+
how to get started with contributing to `tox`, and details of our development processes.

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1-
**Issue**
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ""
5+
labels: bug
6+
assignees: ""
7+
---
8+
9+
## Issue
210

311
Describe what's the expected behaviour and what you're observing.
412

5-
**Environment**
13+
## Environment
614

715
Provide at least:
16+
817
- OS:
9-
- ``pip list`` of the host python where ``virtualenv`` is installed:
18+
- `pip list` of the host python where `virtualenv` is installed:
1019

1120
```console
1221

1322
```
1423

15-
**Output of the virtual environment creation**
24+
## Output of the virtual environment creation
1625

1726
Make sure to run the creation with `-vvv --with-traceback`:
1827

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
2-
blank_issues_enabled: true # default
2+
blank_issues_enabled: true # default
33
contact_links:
4-
- name: '💬 tox-dev/Lobby @ Gitter'
5-
url: https://gitter.im/tox-dev/Lobby
6-
about: Chat with devs
7-
- name: 🤷💻🤦 Discourse
8-
url: https://discuss.python.org/c/packaging
9-
about: |
10-
Please ask typical Q&A here: general ideas for Python packaging, questions about structuring projects and so on
11-
- name: 📝 PyPA Code of Conduct
12-
url: https://www.pypa.io/en/latest/code-of-conduct/
13-
about: ❤ Be nice to other members of the community. ☮ Behave.
4+
- name: "💬 tox-dev/Lobby @ Gitter"
5+
url: https://gitter.im/tox-dev/Lobby
6+
about: Chat with devs
7+
- name: 🤷💻🤦 Discourse
8+
url: https://discuss.python.org/c/packaging
9+
about: |
10+
Please ask typical Q&A here: general ideas for Python packaging, questions about structuring projects and so on
11+
- name: 📝 PyPA Code of Conduct
12+
url: https://www.pypa.io/en/latest/code-of-conduct/
13+
about: ❤ Be nice to other members of the community. ☮ Behave.
Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
---
22
name: Feature request
33
about: Suggest an enhancement for this project
4-
title: ''
4+
title: ""
55
labels: enhancement
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

10-
**What's the problem this feature will solve?**
9+
## What's the problem this feature will solve?
10+
1111
<!-- What are you trying to do, that you are unable to achieve with tox as it currently stands? -->
1212

13-
**Describe the solution you'd like**
13+
## Describe the solution you'd like
14+
1415
<!-- Clear and concise description of what you want to happen. -->
1516

1617
<!-- Provide examples of real world use cases that this would enable and how it solves the problem described above. -->
1718

18-
**Alternative Solutions**
19+
## Alternative Solutions
20+
1921
<!-- Have you tried to workaround the problem using tox or other tools? Or a different approach to solving this issue? Please elaborate here. -->
2022

21-
**Additional context**
23+
## Additional context
24+
2225
<!-- Add any other context, links, etc. about the feature here. -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
### Thanks for contributing, make sure you address all the checklists (for details on how see
1+
# Thanks for contribution
2+
3+
Please, make sure you address all the checklists (for details on how see
24
[development documentation](http://tox.readthedocs.org/en/latest/development.html#development))!
35

4-
- [ ] ran the linter to address style issues (``tox -e fix_lint``)
6+
- [ ] ran the linter to address style issues (`tox -e fix_lint`)
57
- [ ] wrote descriptive pull request text
68
- [ ] ensured there are test(s) validating the fix
7-
- [ ] added news fragment in ``docs/changelog`` folder
9+
- [ ] added news fragment in `docs/changelog` folder
810
- [ ] updated/extended the documentation

.github/workflows/check.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
schedule:
66
- cron: "0 8 * * *"
77

8+
concurrency:
9+
group: check-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
pre_commit:
1014
runs-on: ubuntu-latest
@@ -19,21 +23,21 @@ jobs:
1923
strategy:
2024
fail-fast: false
2125
matrix:
22-
os:
23-
- Ubuntu
24-
- Windows
25-
- MacOs
2626
py:
27-
- "3.10.0-rc.2"
28-
- "3.9"
27+
- "3.10"
28+
- "3.9.9"
2929
- "3.8"
3030
- "3.7"
3131
- "3.6"
32+
os:
33+
- Ubuntu
34+
- Windows
35+
- MacOs
3236
steps:
3337
- name: Setup python for tox
3438
uses: actions/setup-python@v2
3539
with:
36-
python-version: "3.10.0-rc.2"
40+
python-version: "3.10"
3741
- uses: actions/checkout@v2
3842
with:
3943
fetch-depth: 0
@@ -94,10 +98,10 @@ jobs:
9498
- uses: actions/checkout@v2
9599
with:
96100
fetch-depth: 0
97-
- name: Setup Python 3.10.0-rc.2
101+
- name: Setup Python 3.10
98102
uses: actions/setup-python@v2
99103
with:
100-
python-version: "3.10.0-rc.2"
104+
python-version: "3.10"
101105
- name: Install self-tox
102106
run: python -m pip install .
103107
- name: Run check for ${{ matrix.tox_env }}
@@ -107,13 +111,13 @@ jobs:
107111

108112
publish:
109113
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
110-
needs: [ check, test, pre_commit ]
114+
needs: [check, test, pre_commit]
111115
runs-on: ubuntu-latest
112116
steps:
113117
- name: Setup python to build package
114118
uses: actions/setup-python@v2
115119
with:
116-
python-version: "3.10.0-rc.2"
120+
python-version: "3.10"
117121
- name: Install build
118122
run: python -m pip install build
119123
- uses: actions/checkout@v2

.markdownlint.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
MD013:
2+
code_blocks: false
3+
headers: false
4+
line_length: 120
5+
tables: false
6+
7+
MD046:
8+
style: fenced
9+
10+
MD033:
11+
allowed_elements:
12+
- a

.pre-commit-config.yaml

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,79 @@ repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
33
rev: v4.0.1
44
hooks:
5-
- id: check-ast
65
- id: check-builtin-literals
76
- id: check-docstring-first
8-
- id: check-merge-conflict
97
- id: check-yaml
108
- id: check-toml
119
- id: debug-statements
1210
- id: end-of-file-fixer
1311
- id: trailing-whitespace
12+
- id: check-case-conflict
13+
- id: check-merge-conflict
14+
- repo: https://github.com/asottile/add-trailing-comma
15+
rev: v2.2.0
16+
hooks:
17+
- id: add-trailing-comma
18+
args: [--py36-plus]
1419
- repo: https://github.com/asottile/pyupgrade
15-
rev: v2.29.0
20+
rev: v2.29.1
1621
hooks:
1722
- id: pyupgrade
1823
args: ["--py36-plus"]
1924
exclude: "^(src/tox/util/pep517/backend.py|tests/demo_pkg_inline/build.py)$"
2025
- id: pyupgrade
2126
files: "^(src/tox/util/pep517/backend.py|tests/demo_pkg_inline/build.py)$"
22-
- repo: https://github.com/PyCQA/isort
23-
rev: 5.9.3
27+
- repo: https://github.com/pre-commit/pygrep-hooks
28+
rev: v1.9.0
2429
hooks:
25-
- id: isort
30+
- id: rst-backticks
2631
- repo: https://github.com/psf/black
27-
rev: 21.9b0
32+
rev: 21.10b0
2833
hooks:
2934
- id: black
30-
args:
31-
- --safe
35+
args: [--safe]
36+
- repo: https://github.com/PyCQA/isort
37+
rev: 5.10.1
38+
hooks:
39+
- id: isort
40+
- repo: https://github.com/pre-commit/mirrors-prettier
41+
rev: "v2.4.1"
42+
hooks:
43+
- id: prettier
44+
additional_dependencies:
45+
46+
- "@prettier/[email protected]"
47+
args: ["--print-width=120", "--prose-wrap=always"]
48+
- repo: https://github.com/asottile/blacken-docs
49+
rev: v1.11.0
50+
hooks:
51+
- id: blacken-docs
52+
additional_dependencies: [black==21.10b0]
3253
- repo: https://github.com/asottile/setup-cfg-fmt
33-
rev: v1.18.0
54+
rev: v1.19.0
3455
hooks:
3556
- id: setup-cfg-fmt
36-
args:
37-
- --min-py3-version
38-
- "3.6"
39-
- --max-py-version
40-
- "3.10"
4157
- repo: https://github.com/tox-dev/tox-ini-fmt
4258
rev: "0.5.1"
4359
hooks:
4460
- id: tox-ini-fmt
45-
args: [ "-p", "fix" ]
46-
- repo: https://github.com/asottile/blacken-docs
47-
rev: v1.11.0
61+
args: ["-p", "fix"]
62+
- repo: https://github.com/PyCQA/flake8
63+
rev: "4.0.1"
4864
hooks:
49-
- id: blacken-docs
65+
- id: flake8
5066
additional_dependencies:
51-
- black==21.8b0
52-
- repo: https://github.com/pre-commit/pygrep-hooks
53-
rev: v1.9.0
67+
- flake8-bugbear==21.9.2
68+
- flake8-comprehensions==3.7
69+
- flake8-pytest-style==1.5
70+
- flake8-spellcheck==0.24
71+
- flake8-unused-arguments==0.0.6
72+
- flake8-noqa==1.2
73+
- pep8-naming==0.12.1
74+
- repo: https://github.com/igorshubovych/markdownlint-cli
75+
rev: v0.29.0
5476
hooks:
55-
- id: rst-backticks
77+
- id: markdownlint
5678
- repo: local
5779
hooks:
5880
- id: changelogs-rst
@@ -61,15 +83,7 @@ repos:
6183
entry: "changelog files must be named ####.(feature|bugfix|doc|removal|misc).rst"
6284
exclude: ^docs/changelog/(\d+\.(feature|bugfix|doc|removal|misc).rst|README.rst|template.jinja2)
6385
files: ^docs/changelog/
64-
- repo: https://github.com/PyCQA/flake8
65-
rev: 4.0.1
86+
- repo: meta
6687
hooks:
67-
- id: flake8
68-
additional_dependencies:
69-
- flake8-bugbear==21.9.2
70-
- flake8-comprehensions==3.7
71-
- flake8-pytest-style==1.5
72-
- flake8-spellcheck==0.24
73-
- flake8-unused-arguments==0.0.6
74-
- flake8-noqa==1.2
75-
- pep8-naming==0.12.1
88+
- id: check-hooks-apply
89+
- id: check-useless-excludes

.readthedocs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ build:
44
formats:
55
- htmlzip
66
python:
7-
version: 3.8
8-
install:
9-
- method: pip
10-
path: .
11-
extra_requirements:
12-
- docs
7+
version: 3.8
8+
install:
9+
- method: pip
10+
path: .
11+
extra_requirements:
12+
- docs
1313
sphinx:
1414
builder: html
1515
configuration: docs/conf.py

0 commit comments

Comments
 (0)