Skip to content

Commit

Permalink
Merge branch 'Pycord-Development:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
plun1331 authored Aug 28, 2023
2 parents 4f3aa36 + a261176 commit 35ceb72
Show file tree
Hide file tree
Showing 72 changed files with 1,821 additions and 815 deletions.
120 changes: 0 additions & 120 deletions .github/CODE_OF_CONDUCT.md

This file was deleted.

37 changes: 0 additions & 37 deletions .github/DEVELOPER_CERTIFICATE_OF_ORIGIN.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings.
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=120 --statistics
- name: Run code coverage with pytest
run: |
coverage run -m pytest
coverage xml
- name: Upload code coverage to codecov.io
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: OS,PYTHON
files: coverage.xml
flags: ${{ matrix.os }}-${{ matrix.python-version }}
name: codecov-umbrella
fail_ci_if_error: true
verbose: true
docs:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run tdg-github-action
uses: ribtoks/[email protected].6-beta
uses: ribtoks/[email protected].7-beta
with:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO: ${{ github.repository }}
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/version-updates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Version Update Auto Merge
on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
auto-merge:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/PyCQA/autoflake
rev: v2.0.2
rev: v2.2.0
hooks:
- id: autoflake
# args:
Expand All @@ -19,7 +19,7 @@ repos:
# - --remove-duplicate-keys
# - --remove-unused-variables
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.9.0
hooks:
- id: pyupgrade
args: [--py38-plus]
Expand All @@ -28,7 +28,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
args: [--safe, --quiet]
Expand Down Expand Up @@ -77,7 +77,7 @@ repos:
# - id: mypy

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.6
rev: v3.0.0
hooks:
- id: prettier
args: [--prose-wrap=always, --print-width=88]
Expand Down
5 changes: 3 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ version: 2
formats: []

build:
image: latest
os: ubuntu-22.04
tools:
python: "3.8"

sphinx:
configuration: docs/conf.py
fail_on_warning: false
builder: html

python:
version: "3.8"
install:
- method: pip
path: .
Expand Down
Loading

0 comments on commit 35ceb72

Please sign in to comment.