Merge branch 'master' into overlap

Author: Lumabots

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       version:
         type: string
-        description: "Version number to release (e.g., 1.2.3, 1.2.3-rc1, 1.2.0)"
+        description: "Version number to release (e.g., 1.2.3, 1.2.3rc1, 1.2.0)"
         required: true
 
 permissions: write-all
@@ -41,10 +41,16 @@ jobs:
         env:
           VERSION: ${{ github.event.inputs.version }}
         run: |
+          # PEP 440 version regex
+          VALID_VERSION_REGEX='^([0-9]+\.[0-9]+\.[0-9]+((a|b|rc|\.dev|\.post)[0-9]+)?)$'
+          if ! [[ $VERSION =~ $VALID_VERSION_REGEX ]]; then
+            echo "::error::Invalid version string '$VERSION'. Must match PEP 440 (e.g. 1.2.0, 1.2.0rc1, 1.2.0.dev1, 1.2.0a1, 1.2.0b1, 1.2.0.post1)"
+            exit 1
+          fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD^)
           echo "previous_tag=${PREVIOUS_TAG}" >> $GITHUB_OUTPUT
-          if [[ $VERSION =~ -rc ]]; then
+          if [[ $VERSION =~ rc[0-9]+$ ]]; then
             MAJOR_MINOR_VERSION=$(echo $VERSION | grep -oE '^[0-9]+\.[0-9]+')
             echo "branch_name=v${MAJOR_MINOR_VERSION}.x" >> $GITHUB_OUTPUT
             echo "is_rc=true" >> $GITHUB_OUTPUT
@@ -63,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: release
     env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
     steps:
       - name: "Checkout Repository"
         uses: actions/checkout@v5
@@ -75,36 +81,126 @@ jobs:
         shell: bash
         env:
           VERSION_BRANCH: ${{ needs.pre_config.outputs.branch_name }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         run: |
           git fetch origin
           if ! git show-ref --verify --quiet refs/heads/$VERSION_BRANCH; then
             git checkout -b $VERSION_BRANCH
             git push origin $VERSION_BRANCH
           fi
           git checkout $VERSION_BRANCH
-      - name: "Release Pycord"
-        id: pycord-release
-        uses: Aiko-IT-Systems/[email protected]
+      - name: "Setup Python"
+        id: python-setup
+        uses: actions/setup-python@v5
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          pypi-token: ${{ secrets.PYPI_TOKEN }}
-          version-branch-name: ${{ needs.pre_config.outputs.branch_name }}
-          ref: ${{ github.ref_name }}
-          repository: ${{ github.repository }}
           python-version: "3.13"
-          release-requirements: "requirements/_release.txt"
-          version: ${{ needs.pre_config.outputs.version }}
-          is-rc: ${{ needs.pre_config.outputs.is_rc }}
-          pypi-package: "py-cord"
+          cache: "pip"
+          cache-dependency-path: "requirements/_release.txt"
+      - name: "Install Release Dependencies"
+        id: python-install
+        env:
+          REQ_FILE: "requirements/_release.txt"
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools setuptools_scm twine build
+          pip install -r $REQ_FILE
+      - name: "Prepare and Update CHANGELOG.md"
+        id: changelog-update
+        shell: bash
+        env:
+          VERSION: ${{ inputs.version }}
+          REPOSITORY: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          git config user.name "NyuwBot"
+          git config user.email "[email protected]"
+          DATE=$(date +'%Y-%m-%d')
+          sed -i "/These changes are available on the \`.*\` branch, but have not yet been released\./{N;d;}" CHANGELOG.md
+          sed -i "s/## \[Unreleased\]/## [$VERSION] - $DATE/" CHANGELOG.md
+          sed -i "0,/## \[$VERSION\]/ s|## \[$VERSION\]|## [Unreleased]\n\nThese changes are available on the \`$BRANCH\` branch, but have not yet been released.\n\n### Added\n\n### Changed\n\n### Fixed\n\n### Removed\n\n&|" CHANGELOG.md
+          sed -i "s|\[unreleased\]:.*|[unreleased]: https://github.com/$REPOSITORY/compare/v$VERSION...HEAD\n[$VERSION]: https://github.com/$REPOSITORY/compare/$(git describe --tags --abbrev=0 @^)...v$VERSION|" CHANGELOG.md
+          git add CHANGELOG.md
+          git commit -m "chore(release): update CHANGELOG.md for version $VERSION"
+      - name: "Commit and Push Changelog to ${{ github.ref_name }}"
+        id: commit-main-branch
+        shell: bash
+        env:
+          VERSION: ${{ inputs.version }}
+          GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          git config user.name "NyuwBot"
+          git config user.email "[email protected]"
+          git push origin HEAD:$BRANCH -f
+      - name: "Push Changelog to Version Branch"
+        id: commit-version-branch
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          VERSION_BRANCH: ${{ needs.pre_config.outputs.branch_name }}
+        run: |
+          git config user.name "NyuwBot"
+          git config user.email "[email protected]"
+          git push origin HEAD:$VERSION_BRANCH -f
+      - name: "Create Git Tag"
+        id: create-git-tag
+        shell: bash
+        env:
+          VERSION: ${{ inputs.version }}
+          GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+        run: |
+          git config user.name "NyuwBot"
+          git config user.email "[email protected]"
+          git tag v$VERSION -m "Release version $VERSION"
+          git push origin v$VERSION -f
+      - name: "Verify Version"
+        id: python-version-verify
+        shell: bash
+        run: python -m setuptools_scm
+      - name: "Build Package"
+        id: python-version-build
+        shell: bash
+        run: |
+          python3 -m build --sdist
+          python3 -m build --wheel
+      - name: "Create GitHub Release"
+        uses: softprops/[email protected]
+        id: gh-release
+        with:
+          tag_name: "v${{ inputs.version }}"
+          name: "v${{ inputs.version }}"
+          generate_release_notes: true
+          draft: false
+          prerelease: ${{ needs.pre_config.outputs.is_rc }}
+          files: |
+            dist/*.whl
+            dist/*.tar.gz
+          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          make_latest: true
+          repository: ${{ github.repository }}
+          target_commitish: ${{ github.ref_name }}
+
+      - name: "Publish package distributions to PyPI"
+        uses: pypa/[email protected]
+        env:
+          name: "pypi"
+          url: "https://pypi.org/p/py-cord"
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
+          user: __token__
+          attestations: false
+          verify-metadata: false
+
 
       - name: "Echo release url"
-        run: echo "${{ steps.pycord-release.outputs.gh-release }}"
+        run: echo "${{ steps.gh-release.outputs.url }}"
 
   docs_release:
     runs-on: ubuntu-latest
     needs: [lib_release,pre_config]
-    if: ${{ needs.pre_config.outputs.is_rc == 'false' || (needs.pre_config.outputs.is_rc == 'true' && endsWith(needs.pre_config.outputs.version, '.0-rc.1')) }}
+    if: ${{ needs.pre_config.outputs.is_rc == 'false' || (needs.pre_config.outputs.is_rc == 'true' && endsWith(needs.pre_config.outputs.version, '0rc1')) }}
     environment: release
     steps:
       - name: "Sync Versions on Read the Docs"
@@ -117,7 +213,7 @@ jobs:
         run: |
           VERSION=${{ needs.pre_config.outputs.version }}
           MAJOR_MINOR_VERSION=$(echo $VERSION | grep -oE '^[0-9]+\.[0-9]+')
-          if [[ $VERSION == *-rc* ]]; then
+          if [[ $VERSION == *rc* ]]; then
             DOCS_VERSION="v${MAJOR_MINOR_VERSION}.x"
           else
             DOCS_VERSION="v$VERSION"
@@ -132,22 +228,22 @@ jobs:
 
   inform_discord:
     runs-on: ubuntu-latest
-    needs: [lib_release,docs_release,close_milestone,pre_config]
+    needs: [lib_release,docs_release,pre_config]
     environment: release
     steps:
       - name: "Notify Discord"
         run: |
           VERSION=${{ needs.pre_config.outputs.version }}
           MAJOR_MINOR_VERSION=$(echo $VERSION | grep -oE '^[0-9]+\.[0-9]+')
-          if [[ $VERSION == *-rc* ]]; then
+          if [[ $VERSION == *rc* ]]; then
             DOCS_URL="<https://docs.pycord.dev/en/v${MAJOR_MINOR_VERSION}.x/changelog.html>"
           else
             DOCS_URL="<https://docs.pycord.dev/en/v$VERSION/changelog.html>"
           fi
           GITHUB_COMPARE_URL="<https://github.com/Pycord-Development/pycord/compare/${{ needs.pre_config.outputs.previous_tag }}...v$VERSION>"
           GITHUB_RELEASE_URL="<https://github.com/Pycord-Development/pycord/releases/tag/v$VERSION>"
           PYPI_RELEASE_URL="<https://pypi.org/project/py-cord/$VERSION/>"
-          if [[ $VERSION == *-rc* ]]; then
+          if [[ $VERSION == *rc* ]]; then
             ANNOUNCEMENT="## <:pycord:1063211537008955495> Pycord v${MAJOR_MINOR_VERSION} Release Candidate ($VERSION) is available!\n\n"
             ANNOUNCEMENT="${ANNOUNCEMENT}This is a pre-release (release candidate) for testing and feedback.\n\n"
             ANNOUNCEMENT="${ANNOUNCEMENT}You can view the changelog here: <$DOCS_URL>\n\n"
@@ -191,7 +287,7 @@ jobs:
   close_milestone:
     runs-on: ubuntu-latest
     needs: [determine_milestone_id,pre_config]
-    if: ${{ !contains(needs.pre_config.outputs.version, '-') && endsWith(needs.pre_config.outputs.version, '.0') }}
+    if: ${{ !contains(needs.pre_config.outputs.version, 'rc') && endsWith(needs.pre_config.outputs.version, '.0') }}
     environment: release
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -10,6 +10,16 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
+## [2.7.0rc1] - 2025-08-30
+
 ⚠️ **This version removes support for Python 3.8.** ⚠️
 
 ### Added
@@ -1119,7 +1129,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Fix py3.10 UnionType checks issue.
   ([#1240](https://github.com/Pycord-Development/pycord/pull/1240))
 
-[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.6.1...HEAD
+[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.7.0rc1...HEAD
+[2.7.0rc1]: https://github.com/Pycord-Development/pycord/compare/v2.6.0...v2.7.0rc1
 [2.6.1]: https://github.com/Pycord-Development/pycord/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/Pycord-Development/pycord/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/Pycord-Development/pycord/compare/v2.4.1...v2.5.0

discord/channel.py

@@ -2884,8 +2884,6 @@ class CategoryChannel(discord.abc.GuildChannel, Hashable):
         The position in the category list. This is a number that starts at 0. e.g. the
         top category is position 0. Can be ``None`` if the channel was received in an interaction.
 
-        .. note::
-
     flags: :class:`ChannelFlags`
         Extra features of the channel.
 

discord/client.py

@@ -69,7 +69,7 @@
 if TYPE_CHECKING:
     from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
     from .channel import DMChannel
-    from .interaction import Interaction
+    from .interactions import Interaction
     from .member import Member
     from .message import Message
     from .poll import Poll
@@ -553,6 +553,15 @@ async def on_view_error(
         The default view error handler provided by the client.
 
         This only fires for a view if you did not define its :func:`~discord.ui.View.on_error`.
+
+        Parameters
+        ----------
+        error: :class:`Exception`
+            The exception that was raised.
+        item: :class:`Item`
+            The item that the user interacted with.
+        interaction: :class:`Interaction`
+            The interaction that was received.
         """
 
         print(
@@ -570,6 +579,13 @@ async def on_modal_error(self, error: Exception, interaction: Interaction) -> No
         The default implementation prints the traceback to stderr.
 
         This only fires for a modal if you did not define its :func:`~discord.ui.Modal.on_error`.
+
+        Parameters
+        ----------
+        error: :class:`Exception`
+            The exception that was raised.
+        interaction: :class:`Interaction`
+            The interaction that was received.
         """
 
         print(f"Ignoring exception in modal {interaction.modal}:", file=sys.stderr)
@@ -1297,7 +1313,7 @@ def add_listener(self, func: Coro, name: str = MISSING) -> None:
         TypeError
             The ``func`` parameter is not a coroutine function.
         ValueError
-            The ``name`` (event name) does not start with 'on_'
+            The ``name`` (event name) does not start with ``on_``.
 
         Example
         -------
@@ -1361,7 +1377,7 @@ def listen(self, name: str = MISSING, once: bool = False) -> Callable[[Coro], Co
         TypeError
             The function being listened to is not a coroutine.
         ValueError
-            The ``name`` (event name) does not start with 'on_'
+            The ``name`` (event name) does not start with ``on_``.
 
         Example
         -------

discord/commands/core.py

@@ -806,6 +806,7 @@ def _parse_options(self, params, *, check_params: bool = True) -> list[Option]:
             if option == inspect.Parameter.empty:
                 option = str
 
+            option = Option._strip_none_type(option)
             if self._is_typing_literal(option):
                 literal_values = get_args(option)
                 if not all(isinstance(v, (str, int, float)) for v in literal_values):

discord/commands/options.py

@@ -372,17 +372,21 @@ def _strip_none_type(input_type):
         if input_type is type(None):
             raise TypeError("Option type cannot be only NoneType")
 
-        if isinstance(input_type, (types.UnionType, tuple)):
-            args = (
-                get_args(input_type)
-                if isinstance(input_type, types.UnionType)
-                else input_type
-            )
+        args = ()
+        if isinstance(input_type, types.UnionType):
+            args = get_args(input_type)
+        elif getattr(input_type, "__origin__", None) is Union:
+            args = get_args(input_type)
+        elif isinstance(input_type, tuple):
+            args = input_type
+
+        if args:
             filtered = tuple(t for t in args if t is not type(None))
             if not filtered:
                 raise TypeError("Option type cannot be only NoneType")
             if len(filtered) == 1:
                 return filtered[0]
+
             return filtered
 
         return input_type

discord/components.py

@@ -743,7 +743,6 @@ def __str__(self) -> str:
 
     @property
     def url(self) -> str:
-        """Returns this media item's url."""
         return self._url
 
     @url.setter
@@ -850,7 +849,6 @@ def __init__(self, url, *, description=None, spoiler=False):
 
     @property
     def url(self) -> str:
-        """Returns the URL of this gallery's underlying media item."""
         return self.media.url
 
     def is_dispatchable(self) -> bool:

discord/ext/bridge/core.py

@@ -185,8 +185,10 @@ def __init__(self, callback, **kwargs):
     @property
     def name_localizations(self) -> dict[str, str] | None:
         """Returns name_localizations from :attr:`slash_variant`
-        You can edit/set name_localizations directly with
+           You can edit/set name_localizations directly with
+
         .. code-block:: python3
+
             bridge_command.name_localizations["en-UK"] = ...  # or any other locale
             # or
             bridge_command.name_localizations = {"en-UK": ..., "fr-FR": ...}
@@ -200,8 +202,10 @@ def name_localizations(self, value):
     @property
     def description_localizations(self) -> dict[str, str] | None:
         """Returns description_localizations from :attr:`slash_variant`
-        You can edit/set description_localizations directly with
+           You can edit/set description_localizations directly with
+
         .. code-block:: python3
+
             bridge_command.description_localizations["en-UK"] = ...  # or any other locale
             # or
             bridge_command.description_localizations = {"en-UK": ..., "fr-FR": ...}