Skip to content

Update dev deps & CI action versions #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Python Dependencies
uses: HassanAbouelela/actions/setup-python@setup-python_v1.4.0
uses: HassanAbouelela/actions/setup-python@setup-python_v1.4.2
with:
python_version: "3.11"
install_args: "--extras async-rediscache --only main --only doc"
Expand All @@ -23,7 +23,7 @@ jobs:
run: sphinx-build -nW -j auto -b html docs docs/build

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs-latest
path: docs/build/*
Expand All @@ -33,12 +33,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
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.4.0
uses: HassanAbouelela/actions/setup-python@setup-python_v1.4.2
with:
python_version: "3.11"
install_args: "--extras async-rediscache"
Expand All @@ -55,7 +55,7 @@ jobs:
rm -r docs/build/**/.doctrees

- name: Upload Build Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/build/*
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
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.4.0
uses: HassanAbouelela/actions/setup-python@setup-python_v1.4.2
with:
python_version: ${{ matrix.python_version }}
install_args: "--extras async-rediscache --only main --only lint --only test"
Expand All @@ -39,7 +40,7 @@ jobs:
id: prepare-artifact
if: always() && github.event_name == 'pull_request'
continue-on-error: true
run: cat $GITHUB_EVENT_PATH | jq '.pull_request' > pull_request_payload.json
run: cat $GITHUB_EVENT_PATH | jq '.pull_request' > pull_request_payload${{ matrix.python_version }}.json

# This only makes sense if the previous step succeeded. To
# get the original outcome of the previous step before the
Expand All @@ -48,7 +49,7 @@ jobs:
- name: Upload a Build Artifact
if: always() && steps.prepare-artifact.outcome == 'success'
continue-on-error: true
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pull-request-payload
path: pull_request_payload.json
name: pull-request-payload-${{ matrix.python_version }}
path: pull_request_payload${{ matrix.python_version }}.json
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Changelog
=========

- :support:`202` Bump various development dependencies and CI workflow action versions
- :feature:`194` Add the :obj:`pydis_core.utils.interactions.user_has_access` helper function, that returns whether the given user is in the allowed_users list, or has a role from allowed_roles.

- :release:`10.6.0 <30th January 2024>`
Expand Down
2 changes: 1 addition & 1 deletion docs/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def linkcode_resolve(repo_link: str, domain: str, info: dict[str, str]) -> str |

pos = _global_assign_pos(source, symbol_name)
if pos is None:
if symbol_name in ("model_config", "model_fields"):
if symbol_name in ("model_config", "model_fields", "model_computed_fields"):
# These are ClassVars added by pydantic.
# Since they're not in our source code, we cannot resolve them to a url.
return None
Expand Down
782 changes: 385 additions & 397 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pydis_core/utils/cooldown.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from pydis_core.utils import scheduling
from pydis_core.utils.function import command_wraps

__all__ = ["CommandOnCooldown", "block_duplicate_invocations", "P", "R"]
__all__ = ["CommandOnCooldown", "P", "R", "block_duplicate_invocations"]

_KEYWORD_SEP_SENTINEL = object()

Expand Down
2 changes: 1 addition & 1 deletion pydis_core/utils/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import typing
from collections.abc import Callable, Sequence, Set

__all__ = ["command_wraps", "GlobalNameConflictError", "update_wrapper_globals"]
__all__ = ["GlobalNameConflictError", "command_wraps", "update_wrapper_globals"]


if typing.TYPE_CHECKING:
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ async-rediscache = ["async-rediscache"]

[tool.poetry.group.dev.dependencies]
taskipy = "1.12.2"
python-dotenv = "1.0.0"
python-dotenv = "1.0.1"

[tool.poetry.group.test.dependencies]
pytest = "7.4.3"
pytest = "8.0.0"
pytest-cov = "4.1.0"
pytest-xdist = "3.5.0"

[tool.poetry.group.lint.dependencies]
ruff = "0.1.7"
ruff = "0.1.15"
pre-commit = "3.6.0"
typing-extensions = "4.9.0"

[tool.poetry.group.doc.dependencies]
Sphinx = "7.2.6"
GitPython = "3.1.40"
sphinx-autodoc-typehints = "1.25.2"
furo = "2023.9.10"
gitpython = "3.1.41"
sphinx-autodoc-typehints = "1.25.3"
furo = "2024.1.29"
six = "1.16.0"
releases = "2.1.1"
sphinx-multiversion = "0.2.4"
Expand Down Expand Up @@ -89,7 +89,7 @@ ignore = [
"E731",
"RET504",
"RUF005",
"S311",
"S311", "S404",
"SIM102", "SIM108",
]
line-length = 120
Expand Down