Skip to content

Commit ae0a6b7

Browse files
committed
feat!: Reorganize CI workflows and pre-commit configuration.\n\nBREAKING CHANGE: pre_push is no longer needed for formatting.
1 parent b1aab8b commit ae0a6b7

File tree

9 files changed

+37
-136
lines changed

9 files changed

+37
-136
lines changed

.flake8

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

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,3 @@ dist/
1010
.env
1111
.venv
1212
.vscode
13-
14-
# testing based
15-
.token
16-
ext/

.pre-commit-config.yaml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,48 @@ repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
33
rev: v3.2.0
44
hooks:
5+
- id: requirements-txt-fixer
6+
name: Requirements
7+
types: [file]
8+
- id: debug-statements
9+
name: Debugging
10+
language: python
11+
types: [file, python]
512
- id: trailing-whitespace
13+
name: Trailing Whitespace
14+
language: python
15+
types: [file]
616
- id: end-of-file-fixer
17+
name: EOF Newlines
18+
language: python
19+
types: [file]
720
- id: check-yaml
8-
- repo: https://github.com/myint/autoflake
9-
rev: v1.4
10-
hooks:
11-
- id: autoflake
21+
name: YAML Structure
22+
language: python
23+
- id: check-toml
24+
name: TOML Structure
25+
- id: check-merge-conflict
26+
name: Merge Conflicts
1227
- repo: https://github.com/psf/black
1328
rev: 21.8b0
1429
hooks:
1530
- id: black
31+
name: Black Formatting
32+
language: python
33+
types: [file, python]
34+
args: [--line-length=100]
1635
- repo: https://gitlab.com/pycqa/flake8
1736
rev: 3.9.2
1837
hooks:
1938
- id: flake8
39+
name: flake8 Formatting
40+
language: python
41+
types: [file, python]
42+
args: [--max-line-length=100, --ignore=E203 E501 E402 W503 W504]
2043
- repo: https://github.com/pycqa/isort
2144
rev: 5.9.3
2245
hooks:
2346
- id: isort
47+
name: isort Formatting
48+
language: python
49+
types: [file, python]

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ discord-interactions
1414

1515
.. image:: https://img.shields.io/pypi/pyversions/discord-py-interactions.svg
1616
:target: https://pypi.python.org/pypi/discord-py-interactions/
17-
:alt: PyPI pyversions
17+
:alt: PyPI Versions
1818

1919
.. image:: https://img.shields.io/pypi/v/discord-py-interactions.svg
2020
:target: https://pypi.python.org/pypi/discord-py-interactions/
21-
:alt: PyPI version shields.io
21+
:alt: PyPI Version
2222

2323
.. image:: https://readthedocs.org/projects/discord-interactions/badge/?version=latest
2424
:target: http://discord-interactions.readthedocs.io/?badge=latest

pre_push.py

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

readthedocs.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
# .readthedocs.yml
2-
# Read the Docs configuration file
3-
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4-
5-
# Required
61
version: 2
7-
8-
# Build documentation in the docs/ directory with Sphinx
92
sphinx:
103
configuration: docs/conf.py
11-
12-
# Build documentation with MkDocs
13-
#mkdocs:
14-
# configuration: mkdocs.yml
15-
16-
# Optionally build your docs in additional formats such as PDF
174
formats:
185
- pdf
19-
20-
# Optionally set the version of Python and requirements required to build your docs
216
python:
22-
version: 3.8 # apparently RTD is screaming that 3.x "doesn't exist"
7+
version: 3.9
238
install:
249
- method: pip
2510
extra_requirements:

setup.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,23 @@
2525
name="discord-py-interactions",
2626
version=VERSION,
2727
author="goverfl0w",
28-
author_email="jwalston2002@gmail.com",
29-
description="A simple API wrapper for Discord interactions.",
28+
author_email="james.discord.interactions@gmail.com",
29+
description="Easy, simple, scalable and modular: a Python API wrapper for interactions.",
3030
extras_require=extras,
3131
install_requires=requirements,
3232
license="MIT License",
3333
long_description=README,
34+
long_description_content_type="text/markdown",
3435
url="https://github.com/goverfl0w/discord-interactions",
3536
packages=find_packages(),
36-
python_requires=">=3.6",
37+
python_requires=">=3.9",
3738
classifiers=[
3839
"Development Status :: 4 - Beta",
3940
"Intended Audience :: Developers",
4041
"License :: OSI Approved :: MIT License",
4142
"Natural Language :: English",
4243
"Operating System :: OS Independent",
4344
"Programming Language :: Python :: 3",
44-
"Programming Language :: Python :: 3.6",
45-
"Programming Language :: Python :: 3.7",
46-
"Programming Language :: Python :: 3.8",
4745
"Programming Language :: Python :: 3.9",
4846
"Topic :: Internet",
4947
"Topic :: Software Development :: Libraries :: Python Modules",

test.py

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

test_2.py

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

0 commit comments

Comments
 (0)