Merge pull request #151 from python-discord/Python-3.11

Python 3.11 support

Author: HassanAbouelela

.dockerignore

@@ -1,9 +1,7 @@
 *
 
 !pydis_core/
-!docs/
-!tests/
-
+!dev/
 !pyproject.toml
 !poetry.lock
-!tox.ini
+!README.md

.github/workflows/docs.yaml

@@ -1,15 +1,8 @@
 name: Build Docs
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
   workflow_dispatch:
-
-concurrency:
-  group: docs-deployment-${{ github.ref }}
-  cancel-in-progress: true
+  workflow_call:
 
 jobs:
   latest-build:
@@ -21,11 +14,11 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install Python Dependencies
-        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1
+        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.2
         with:
           dev: true
-          python_version: "3.10"
-          install_args: "--extras async-rediscache"
+          python_version: "3.11"
+          install_args: "--extras async-rediscache --only main --only doc"
 
       - name: Generate HTML Site
         run: sphinx-build -nW -j auto -b html docs docs/build
@@ -46,10 +39,10 @@ jobs:
           fetch-depth: 0  # We need to check out the entire repository to find all tags
 
       - name: Install Python Dependencies
-        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1
+        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.2
         with:
           dev: true
-          python_version: "3.10"
+          python_version: "3.11"
           install_args: "--extras async-rediscache"
 
       - name: Build All Doc Versions

.github/workflows/lint-test.yaml

@@ -1,27 +1,24 @@
 name: Lint & Test
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  workflow_call:
 
 jobs:
   lint:
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version: ["3.10", "3.11"]
     name: Run Linting & Test Suites
     runs-on: ubuntu-latest
     steps:
       - name: Install Python Dependencies
-        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1
+        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.2
         with:
           # Set dev=true to run pre-commit which is a dev dependency
           dev: true
-          python_version: "3.10"
-          install_args: "--extras async-rediscache"
+          python_version: ${{ matrix.python_version }}
+          install_args: "--extras async-rediscache --only main --only lint --only test"
 
       # We will not run `flake8` here, as we will use a separate flake8
       # action.
@@ -43,6 +40,9 @@ jobs:
       - name: Run tests and generate coverage report
         run: python -m pytest -n auto --cov pydis_core -q
 
+      - name: Build and dry run the example bot to ensure deps can be installed & imported
+        run: docker run --rm --env GUILD_ID=1234 --env IN_CI=true $(docker build --build-arg python_version=${{ matrix.python_version }} -q -f ./dev/Dockerfile .) run python -m dev.bot
+
       # Prepare the Pull Request Payload artifact. If this fails, we
       # we fail silently using the `continue-on-error` option. It's
       # nice if this succeeds, but if it fails for any reason, it

.github/workflows/main.yaml

@@ -0,0 +1,17 @@
+name: main
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint-test:
+    uses: ./.github/workflows/lint-test.yaml
+  docs:
+    uses: ./.github/workflows/docs.yaml

dev/Dockerfile

@@ -1,16 +1,17 @@
-FROM --platform=linux/amd64 ghcr.io/chrislovering/python-poetry-base:3.10-slim
+ARG python_version=3.11
 
+FROM --platform=linux/amd64 ghcr.io/chrislovering/python-poetry-base:$python_version-slim
 
 # Install project dependencies
 WORKDIR /app
 COPY pyproject.toml poetry.lock ./
-RUN poetry install --no-root
+RUN poetry install --no-root --only dev,main
 
 # Copy the source code in last to optimize rebuilding the image
 COPY . .
 
 # Install again, this time with the root project
-RUN poetry install
+RUN poetry install --only-root
 
-ENTRYPOINT ["python"]
-CMD ["-m", "bot"]
+ENTRYPOINT ["poetry"]
+CMD ["run", "python", "-m", "bot"]

dev/bot/__main__.py

@@ -31,4 +31,5 @@ async def main() -> None:
     async with bot:
         await bot.start(os.getenv("BOT_TOKEN"))
 
-asyncio.run(main())
+if os.getenv("IN_CI", "").lower() != "true":
+    asyncio.run(main())

docker-compose.yaml

@@ -68,9 +68,8 @@ services:
     build:
       context: .
       dockerfile: dev/Dockerfile
-    volumes:  # Don't do .:/app here to ensure project venv from host doens't overwrite venv in image
-      - ./pydis_core:/app/pydis_core:ro
-      - ./bot:/app/bot:ro
+    volumes:
+      - .:/app:ro
     tty: true
     depends_on:
       - web

docs/changelog.rst

@@ -4,12 +4,16 @@
 Changelog
 =========
 
+- :release:`9.2.0 <17th November 2022>`
+- :support:`151` Add support for Python 3.11
+
 - :release:`9.1.1 <14th November 2022>`
 - :bug:`162` Handle not being able to delete the interaction message on button press/timeout.
 
 
 - :release:`9.1.0 <13th November 2022>`
 - :feature:`158` Bump Discord.py to :literal-url:`2.1.0 <https://github.com/Rapptz/discord.py/releases/tag/v2.1.0>`.
+- :feature:`88` Add a decorator that stops successive duplicate invocations of commands
 
 
 - :release:`9.0.0 <5th November 2022>`