Skip to content

Commit bf92510

Browse files
authored
Merge pull request #889 from dev-hato/develop
リリース
2 parents 17a79be + 7820cca commit bf92510

24 files changed

Lines changed: 1231 additions & 485 deletions

.github/workflows/pr-check-yarn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
ref: ${{ github.event.pull_request.head.sha }}
1919
- run: echo "NODE_VERSION=16" >> "${GITHUB_ENV}"
2020
- name: Set up Node.js ${{ env.NODE_VERSION }}
21-
uses: actions/setup-node@v3.0.0
21+
uses: actions/setup-node@v3.1.0
2222
with:
2323
node-version: ${{ env.NODE_VERSION }}
2424
cache: yarn

.github/workflows/pr-copy-ci-hato-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
find hato-bot/${worklows_path} -type f \
4040
-not -name "*hato-bot.yml" \
4141
-exec cp {} "${DEST_PATH}" \;
42-
for f in .markdown-lint.yml .python-lint .textlintrc .gitleaks.toml .pre-commit-config.yaml .python-version package.json yarn.lock
42+
for f in .markdown-lint.yml .python-lint .textlintrc .gitleaks.toml .mypy.ini .pre-commit-config.yaml .python-version
4343
do
4444
cp hato-bot/${f} sudden-death/
4545
done

.github/workflows/pr-format.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
- name: Install dependencies
5959
run: |
6060
pipenv install --dev
61+
pipenv lock
6162
# autopep8でformatする
6263
# --exit-codeをつけることで、autopep8内でエラーが起きれば1、差分があれば2のエラーステータスコードが返ってくる。正常時は0が返る
6364
- name: Format files

.github/workflows/pr-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
cp -r ${{ env.venv_path }} "${DEST_PATH}"
6161
- run: echo "NODE_VERSION=16" >> "${GITHUB_ENV}"
6262
- name: Set up Node.js ${{ env.NODE_VERSION }}
63-
uses: actions/setup-node@v3.0.0
63+
uses: actions/setup-node@v3.1.0
6464
with:
6565
node-version: ${{ env.NODE_VERSION }}
6666
cache: yarn
@@ -70,7 +70,7 @@ jobs:
7070
- run: |
7171
echo "PYTHONPATH=/github/workspace/:/github/workflow/.venv/lib/python$(echo 'import sys; print(".".join(map(str, sys.version_info[0:2])))' | python)/site-packages" >> "${GITHUB_ENV}"
7272
- name: Lint files
73-
uses: github/super-linter/slim@v4.9.0
73+
uses: github/super-linter/slim@v4.9.2
7474
env:
7575
VALIDATE_ALL_CODEBASE: true
7676
VALIDATE_PYTHON_BLACK: false

.github/workflows/update_python.yml

Lines changed: 0 additions & 166 deletions
This file was deleted.

.mypy.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Global options:
2+
3+
[mypy]
4+
ignore_missing_imports = True
5+
exclude = ["^node_modules/"]

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
repos:
33
- repo: https://github.com/zricethezav/gitleaks
4-
rev: v8.3.0
4+
rev: v8.5.3
55
hooks:
66
- id: gitleaks

.python-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ignore=CVS
1414

1515
# Add files or directories matching the regex patterns to the blacklist. The
1616
# regex matches against base names, not paths.
17-
ignore-patterns=
17+
ignore-patterns=node_modules/.*
1818

1919
# Python code to execute, usually for sys.path manipulation such as
2020
# pygtk.require().

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10.2
1+
3.10.4

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@
77
* `Removed` 削除された機能について。
88
* `Fixed` バグ修正について。
99

10+
## Unreleased
11+
12+
## v2.4.0 - 2022-04-06
13+
14+
### Added
15+
16+
* 東京電力管内の電力使用率を取得する機能を追加しました。(#902)
17+
* botの開発時にlinterが使用可能になりました。(#875)
18+
19+
### Fixed
20+
21+
* おみくじ機能の小吉の絵文字が表示されない問題を修正しました。(#893)
22+
1023
## v2.3.0 - 2022-03-09
1124

1225
### Added

0 commit comments

Comments
 (0)