chore: merge conflicts

Author: lukegalbraithrussell

.github/maintainers_guide.md

@@ -15,7 +15,7 @@ $ brew update
 $ brew install pyenv
 ```
 
-Install necessary Python runtimes for development/testing. You can rely on Travis CI builds for testing with various major versions. https://github.com/slackapi/bolt-python/blob/main/.travis.yml
+Install necessary Python runtimes for development/testing. You can rely on GitHub Actions workflows for testing with various major versions. <https://github.com/slackapi/bolt-python/tree/main/.github/workflows>
 
 ```bash
 $ pyenv install -l | grep -v "-e[conda|stackless|pypy]"
@@ -34,7 +34,7 @@ $ pyenv rehash
 
 Then, you can create a new Virtual Environment this way:
 
-```
+```bash
 $ python -m venv env_3.8.5
 $ source env_3.8.5/bin/activate
 ```
@@ -94,8 +94,9 @@ $ ngrok http 3000 --subdomain {your-domain}
 #### Develop Locally
 
 If you want to test the package locally you can.
+
 1. Build the package locally
-   - Run 
+   - Run
      ```bash
      scripts/build_pypi_package.sh
      ```
@@ -106,8 +107,7 @@ If you want to test the package locally you can.
      ```bash
      pip install <project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl
      ```
-   - It is also possible to include `<project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl` in a [requirements.txt](https://pip.pypa.io/en/stable/user_guide/#requirements-files) file 
-
+   - It is also possible to include `<project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl` in a [requirements.txt](https://pip.pypa.io/en/stable/user_guide/#requirements-files) file
 
 ### Releasing
 
@@ -121,19 +121,18 @@ If you want to test the package locally you can.
 
 ##### $HOME/.pypirc
 
-```
+```toml
 [testpypi]
 username: {your username}
 password: {your password}
 ```
 
-
 #### Development Deployment
 
 1. Create a branch in which the development release will live:
     - Bump the version number in adherence to [Semantic Versioning](http://semver.org/) and [Developmental Release](https://peps.python.org/pep-0440/#developmental-releases) in `slack_bolt/version.py`
       - Example the current version is `1.2.3` a proper development bump would be `1.3.0.dev0`
-      - `.dev` will indicate to pip that this is a [Development Release](https://peps.python.org/pep-0440/#developmental-releases) 
+      - `.dev` will indicate to pip that this is a [Development Release](https://peps.python.org/pep-0440/#developmental-releases)
       - Note that the `dev` version can be bumped in development releases: `1.3.0.dev0` -> `1.3.0.dev1`
     - Commit with a message including the new version number. For example `1.3.0.dev0` & Push the commit to a branch where the development release will live (create it if it does not exist)
       - `git checkout -b future-release`
@@ -150,26 +149,35 @@ password: {your password}
 
 3. (Slack Internal) Communicate the release internally
 
-
 #### Production Deployment
 
 1. Create the commit for the release:
    - Bump the version number in adherence to [Semantic Versioning](http://semver.org/) in `slack_bolt/version.py`
    - Build the docs with `./scripts/generate_api_docs.sh`.
    - Commit with a message including the new version number. For example `1.2.3` & Push the commit to a branch and create a PR to sanity check.
-     - `git checkout -b v1.2.3-release`
-     - `git add --all`
-     - `git commit -m 'version 1.2.3'`
-     - `git push {your-fork} v1.2.3-release`
-   - Merge in release PR after getting an approval from at least one maintainer.
-   - Create a git tag for the release. For example `git tag v1.2.3`.
-   - Push the tag up to github with `git push origin --tags`
+     - `git checkout -b v1.2.3`
+     - `git commit -a -m 'version 1.2.3'`
+   - Open a PR and merge after receiving at least one approval from other maintainers.
 
 2. Distribute the release
    - Use the latest stable Python runtime
-   - `python -m venv .venv`
-   - `./scripts/deploy_to_pypi_org.sh`
-   - Create a GitHub release - https://github.com/slackapi/bolt-python/releases
+      - `python --version`
+      - `python -m venv .venv`
+      - `./scripts/deploy_to_pypi_org.sh`
+   - Create a new GitHub Release from the [Releases page](https://github.com/slackapi/bolt-python/releases) by clicking the "Draft a new release" button.
+      - Enter the new version number updated from the commit (e.g. `v1.2.3`) into the "Choose a tag" input.
+      - Ensure the tag `Target` branch is `main` (e.g `Target:main`).
+      - Click the "Create a new tag: x.x.x on publish" button. This won't create your tag immediately.
+      - Name the release after the version number updated from the commit (e.g. `version 1.2.3`)
+      - Auto-generate the release notes by clicking the "Auto-generate release
+      notes" button. This will pull in changes that will be included in your
+      release.
+      - Edit the resulting notes to ensure they have decent messaging that are
+      understandable by non-contributors, but each commit should still have it's
+      own line.
+      - Ensure that this version adheres to [semantic versioning](http://semver.org/). See
+      [Versioning](#versioning-and-tags) for correct version format. Version tags
+      should match the following pattern: `v2.5.0`.
 
    ```markdown
    ## New Features
@@ -232,7 +240,7 @@ reopening is great and better than creating a duplicate issue.
 
 ## Managing Documentation
 
-See the [`/docs/README.md`](../docs/README.md) file for documentation instructions. 
+See the [`/docs/README.md`](../docs/README.md) file for documentation instructions.
 
 ## Everything else
 

.github/pull_request_template.md

@@ -1,14 +1,20 @@
-(Describe the goal of this PR. Mention any related Issue numbers)
+## Summary
 
-### Category (place an `x` in each of the `[ ]`)
+<!-- Describe the goal of this PR. Mention any related issue numbers -->
+
+### Testing
+
+<!-- Describe what steps a reviewer should follow to test your changes. -->
+
+### Category <!-- place an `x` in each of the `[ ]`  -->
 
 * [ ] `slack_bolt.App` and/or its core components
 * [ ] `slack_bolt.async_app.AsyncApp` and/or its core components
 * [ ] Adapters in `slack_bolt.adapter`
 * [ ] Document pages under `/docs`
 * [ ] Others
 
-## Requirements (place an `x` in each `[ ]`)
+## Requirements <!-- place an `x` in each `[ ]` -->
 
 Please read the [Contributing guidelines](https://github.com/slackapi/bolt-python/blob/main/.github/contributing.md) and [Code of Conduct](https://slackhq.github.io/code-of-conduct) before creating this issue or pull request. By submitting, you are agreeing to those rules.
 

.github/workflows/codecov.yml

@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.13"]
     env:
       BOLT_PYTHON_CODECOV_RUNNING: "1"
     steps:
@@ -31,7 +31,7 @@ jobs:
         run: |
           pytest --cov=./slack_bolt/ --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
           verbose: true

.github/workflows/mypy.yml

@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/tests.yml

@@ -12,7 +12,15 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -44,17 +52,9 @@ jobs:
       - name: Run tests for HTTP Mode adapters (Django)
         run: |
           pytest tests/adapter_tests/django/
-      - name: Run tests for HTTP Mode adapters (Falcon 3.x)
+      - name: Run tests for HTTP Mode adapters (Falcon)
         run: |
           pytest tests/adapter_tests/falcon/
-      - name: Run tests for HTTP Mode adapters (Falcon 2.x)
-        run: |
-          # Falcon 2.x does not support Python 3.11 or newer
-          # See also: https://github.com/slackapi/bolt-python/issues/757
-          if [ ${{ matrix.python-version }} != "3.11" ]; then
-            pip install "falcon<3"
-            pytest tests/adapter_tests/falcon/
-          fi
       - name: Run tests for HTTP Mode adapters (Flask)
         run: |
           pytest tests/adapter_tests/flask/
@@ -76,8 +76,6 @@ jobs:
           pytest tests/adapter_tests/socket_mode/
       - name: Run tests for HTTP Mode adapters (asyncio-based libraries)
         run: |
-          # Falcon supports Python 3.11 since its v3.1.1
-          pip install "falcon>=3.1.1,<4"
           pytest tests/adapter_tests_async/
       - name: Run tests for HTTP Mode adapters (ASGI)
         run: |

docs/README.md

@@ -30,7 +30,9 @@ website/
 ├── src/
 │   ├── pages/ (stuff that isn't docs. This is empty for this repo!)
 │   └── theme/ (only contains the 404 page)
-├── docusaurus.config.js (main config file. also where to set navbar/footer)
+├── docusaurus.config.js (main config file)
+├── footerConfig.js (footer. go to main repo to change)
+├── navbarConfig.js (navbar. go to main repo to change)
 └── sidebar.js (manually set where the docs are in the sidebar.)
 ```
 

docs/content/concepts/web-api.md

@@ -4,7 +4,7 @@ lang: en
 slug: /concepts/web-api
 ---
 
-You can call [any Web API method](https://api.slack.com/methods) using the [`WebClient`](https://tools.slack.dev/python-slack-sdk/basic_usage.html) provided to your Bolt app as either `app.client` or `client` in middleware/listener arguments (given that your app has the appropriate scopes). When you call one the client's methods, it returns a `SlackResponse` which contains the response from Slack.
+You can call [any Web API method](https://api.slack.com/methods) using the [`WebClient`](https://tools.slack.dev/python-slack-sdk/web) provided to your Bolt app as either `app.client` or `client` in middleware/listener arguments (given that your app has the appropriate scopes). When you call one the client's methods, it returns a `SlackResponse` which contains the response from Slack.
 
 The token used to initialize Bolt can be found in the `context` object, which is required to call most Web API methods.
 
@@ -25,4 +25,4 @@ def say_hello(client, message):
         post_at=when_september_ends,
         text="Summer has come and passed"
     )
-```
+```