Skip to content

Commit ba358a5

Browse files
Merge branch 'main' into v1.22.0
2 parents 6d66beb + f1fb115 commit ba358a5

File tree

2 files changed

+37
-23
lines changed

2 files changed

+37
-23
lines changed

.github/maintainers_guide.md

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ brew update
1515
$ brew install pyenv
1616
```
1717

18-
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
18+
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>
1919

2020
```bash
2121
$ pyenv install -l | grep -v "-e[conda|stackless|pypy]"
@@ -34,7 +34,7 @@ $ pyenv rehash
3434

3535
Then, you can create a new Virtual Environment this way:
3636

37-
```
37+
```bash
3838
$ python -m venv env_3.8.5
3939
$ source env_3.8.5/bin/activate
4040
```
@@ -94,8 +94,9 @@ $ ngrok http 3000 --subdomain {your-domain}
9494
#### Develop Locally
9595

9696
If you want to test the package locally you can.
97+
9798
1. Build the package locally
98-
- Run
99+
- Run
99100
```bash
100101
scripts/build_pypi_package.sh
101102
```
@@ -106,8 +107,7 @@ If you want to test the package locally you can.
106107
```bash
107108
pip install <project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl
108109
```
109-
- 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
110-
110+
- 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
111111

112112
### Releasing
113113

@@ -121,19 +121,18 @@ If you want to test the package locally you can.
121121

122122
##### $HOME/.pypirc
123123

124-
```
124+
```toml
125125
[testpypi]
126126
username: {your username}
127127
password: {your password}
128128
```
129129

130-
131130
#### Development Deployment
132131

133132
1. Create a branch in which the development release will live:
134133
- 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`
135134
- Example the current version is `1.2.3` a proper development bump would be `1.3.0.dev0`
136-
- `.dev` will indicate to pip that this is a [Development Release](https://peps.python.org/pep-0440/#developmental-releases)
135+
- `.dev` will indicate to pip that this is a [Development Release](https://peps.python.org/pep-0440/#developmental-releases)
137136
- Note that the `dev` version can be bumped in development releases: `1.3.0.dev0` -> `1.3.0.dev1`
138137
- 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)
139138
- `git checkout -b future-release`
@@ -150,26 +149,35 @@ password: {your password}
150149

151150
3. (Slack Internal) Communicate the release internally
152151

153-
154152
#### Production Deployment
155153

156154
1. Create the commit for the release:
157155
- Bump the version number in adherence to [Semantic Versioning](http://semver.org/) in `slack_bolt/version.py`
158156
- Build the docs with `./scripts/generate_api_docs.sh`.
159157
- 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.
160-
- `git checkout -b v1.2.3-release`
161-
- `git add --all`
162-
- `git commit -m 'version 1.2.3'`
163-
- `git push {your-fork} v1.2.3-release`
164-
- Merge in release PR after getting an approval from at least one maintainer.
165-
- Create a git tag for the release. For example `git tag v1.2.3`.
166-
- Push the tag up to github with `git push origin --tags`
158+
- `git checkout -b v1.2.3`
159+
- `git commit -a -m 'version 1.2.3'`
160+
- Open a PR and merge after receiving at least one approval from other maintainers.
167161

168162
2. Distribute the release
169163
- Use the latest stable Python runtime
170-
- `python -m venv .venv`
171-
- `./scripts/deploy_to_pypi_org.sh`
172-
- Create a GitHub release - https://github.com/slackapi/bolt-python/releases
164+
- `python --version`
165+
- `python -m venv .venv`
166+
- `./scripts/deploy_to_pypi_org.sh`
167+
- Create a new GitHub Release from the [Releases page](https://github.com/slackapi/bolt-python/releases) by clicking the "Draft a new release" button.
168+
- Enter the new version number updated from the commit (e.g. `v1.2.3`) into the "Choose a tag" input.
169+
- Ensure the tag `Target` branch is `main` (e.g `Target:main`).
170+
- Click the "Create a new tag: x.x.x on publish" button. This won't create your tag immediately.
171+
- Name the release after the version number updated from the commit (e.g. `version 1.2.3`)
172+
- Auto-generate the release notes by clicking the "Auto-generate release
173+
notes" button. This will pull in changes that will be included in your
174+
release.
175+
- Edit the resulting notes to ensure they have decent messaging that are
176+
understandable by non-contributors, but each commit should still have it's
177+
own line.
178+
- Ensure that this version adheres to [semantic versioning](http://semver.org/). See
179+
[Versioning](#versioning-and-tags) for correct version format. Version tags
180+
should match the following pattern: `v2.5.0`.
173181

174182
```markdown
175183
## New Features
@@ -232,7 +240,7 @@ reopening is great and better than creating a duplicate issue.
232240
233241
## Managing Documentation
234242
235-
See the [`/docs/README.md`](../docs/README.md) file for documentation instructions.
243+
See the [`/docs/README.md`](../docs/README.md) file for documentation instructions.
236244
237245
## Everything else
238246

.github/pull_request_template.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
(Describe the goal of this PR. Mention any related Issue numbers)
1+
## Summary
22

3-
### Category (place an `x` in each of the `[ ]`)
3+
<!-- Describe the goal of this PR. Mention any related issue numbers -->
4+
5+
### Testing
6+
7+
<!-- Describe what steps a reviewer should follow to test your changes. -->
8+
9+
### Category <!-- place an `x` in each of the `[ ]` -->
410

511
* [ ] `slack_bolt.App` and/or its core components
612
* [ ] `slack_bolt.async_app.AsyncApp` and/or its core components
713
* [ ] Adapters in `slack_bolt.adapter`
814
* [ ] Document pages under `/docs`
915
* [ ] Others
1016

11-
## Requirements (place an `x` in each `[ ]`)
17+
## Requirements <!-- place an `x` in each `[ ]` -->
1218

1319
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.
1420

0 commit comments

Comments
 (0)