Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreamsorcerer authored Sep 30, 2021
2 parents 7cf6819 + dab21a4 commit 268c575
Show file tree
Hide file tree
Showing 170 changed files with 3,279 additions and 1,515 deletions.
2 changes: 2 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
codecov:
branch: master
notify:
after_n_builds: 10

coverage:
range: "95..100"
Expand Down
66 changes: 0 additions & 66 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

138 changes: 138 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
---
name: Bug Report
description: Create a report to help us improve.
labels: [bug]
assignees: aio-libs/triagers
body:
- type: markdown
attributes:
value: |
**Thanks for taking a minute to file a bug report!**
Verify first that your issue is not [already reported on
GitHub][issue search].
_Please fill out the form below with as many precise
details as possible._
[issue search]: ../search?q=is%3Aissue&type=issues
- type: textarea
attributes:
label: Describe the bug
description: >-
A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
attributes:
label: To Reproduce
description: >-
Describe the steps to reproduce this bug.
placeholder: |
1. Implement the following server or a client '...'
2. Then run '...'
3. An error occurs.
validations:
required: true

- type: textarea
attributes:
label: Expected behavior
description: >-
A clear and concise description of what you expected to happen.
validations:
required: true

- type: textarea
attributes:
label: Logs/tracebacks
description: |
If applicable, add logs/tracebacks to help explain your problem.
Paste the output of the steps above, including the commands
themselves and their output/traceback etc.
render: python-traceback
validations:
required: true

- type: textarea
attributes:
label: Python Version
description: Attach your version of Python.
render: console
value: |
$ python --version
validations:
required: true
- type: textarea
attributes:
label: aiohttp Version
description: Attach your version of aiohttp.
render: console
value: |
$ python -m pip show aiohttp
validations:
required: true
- type: textarea
attributes:
label: multidict Version
description: Attach your version of multidict.
render: console
value: |
$ python -m pip show multidict
validations:
required: true
- type: textarea
attributes:
label: yarl Version
description: Attach your version of yarl.
render: console
value: |
$ python -m pip show yarl
validations:
required: true

- type: textarea
attributes:
label: OS
placeholder: >-
For example, Arch Linux, Windows, macOS, etc.
validations:
required: true

- type: dropdown
attributes:
label: Related component
description: >-
aiohttp is both server framework and client library.
For getting rid of confusing make sure to select
'server', 'client' or both.
multiple: true
options:
- Server
- Client
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: |
Add any other context about the problem here.
Describe the environment you have that lead to your issue.
This includes proxy server and other bits that are related to your case.
- type: checkboxes
attributes:
label: Code of Conduct
description: |
Read the [aio-libs Code of Conduct][CoC] first.
[CoC]: https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
options:
- label: I agree to follow the aio-libs Code of Conduct
required: true
...
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

75 changes: 75 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
name: 🚀 Feature request
description: Suggest an idea for this project.
labels: enhancement
body:
- type: markdown
attributes:
value: |
**Thanks for taking a minute to file a feature for aiohttp!**
Verify first that your feature request is not [already reported on
GitHub][issue search].
_Please fill out the form below with as many precise
details as possible._
[issue search]: ../search?q=is%3Aissue&type=issues
- type: textarea
attributes:
label: Is your feature request related to a problem?
description: >-
Please add a clear and concise description of what
the problem is. _Ex. I'm always frustrated when [...]_
- type: textarea
attributes:
label: Describe the solution you'd like
description: >-
A clear and concise description of what you want to happen.
validations:
required: true

- type: textarea
attributes:
label: Describe alternatives you've considered
description: >-
A clear and concise description of any alternative solutions
or features you've considered.
validations:
required: true

- type: dropdown
attributes:
label: Related component
description: >-
aiohttp is both server framework and client library.
For getting rid of confusing make sure to select
'server', 'client' or both.
multiple: true
options:
- Server
- Client
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: >-
Add any other context or screenshots about
the feature request here.
- type: checkboxes
attributes:
label: Code of Conduct
description: |
Read the [aio-libs Code of Conduct][CoC] first.
[CoC]: https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
options:
- label: I agree to follow the aio-libs Code of Conduct
required: true
...
25 changes: 21 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ updates:
directory: "/"
labels:
- dependencies
- autosquash
schedule:
interval: "daily"

Expand All @@ -15,7 +14,6 @@ updates:
directory: "/"
labels:
- dependencies
- autosquash
schedule:
interval: "daily"
open-pull-requests-limit: 10
Expand All @@ -25,17 +23,36 @@ updates:
directory: "/"
labels:
- dependencies
- autosquash
target-branch: "3.8"
schedule:
interval: "daily"
open-pull-requests-limit: 10

# Maintain dependencies for Python aiohttp 3.8
- package-ecosystem: "pip"
directory: "/"
labels:
- dependencies
target-branch: "3.8"
schedule:
interval: "daily"
open-pull-requests-limit: 10

# Maintain dependencies for GitHub Actions aiohttp 3.8
- package-ecosystem: "github-actions"
directory: "/"
labels:
- dependencies
target-branch: "3.8"
schedule:
interval: "daily"
open-pull-requests-limit: 10

# Maintain dependencies for Python aiohttp 3.8
- package-ecosystem: "pip"
directory: "/"
labels:
- dependencies
- autosquash
target-branch: "3.8"
schedule:
interval: "daily"
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Dependabot auto-merge
on: pull_request_target

permissions:
pull-requests: write
contents: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Loading

0 comments on commit 268c575

Please sign in to comment.