Merge pull request #2432 from dev-hato/develop

nakkaa · web-flow · commit 2bc8a11cb16d · 2023-04-07T01:01:44.000+09:00
リリース
diff --git a/.github/workflows/add-to-task-list.yml b/.github/workflows/add-to-task-list.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == github.event.pull_request.head.repo.full_name
     steps:
-      - uses: dev-hato/actions-add-to-projects@v0.0.26
+      - uses: dev-hato/actions-add-to-projects@v0.0.31
         with:
           github_app_id: ${{ secrets.PROJECT_AUTOMATION_APP_ID }}
           github_app_private_key: ${{ secrets.PROJECT_AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -21,7 +21,7 @@ jobs:
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
diff --git a/.github/workflows/deploy-hato-bot.yml b/.github/workflows/deploy-hato-bot.yml
@@ -28,7 +28,7 @@ jobs:
       packages: write
     if: github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.action != 'closed' && github.repository == github.event.pull_request.head.repo.full_name)
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Set .env
@@ -43,7 +43,7 @@ jobs:
         uses: docker/setup-qemu-action@v2.1.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.4.1
+        uses: docker/setup-buildx-action@v2.5.0
       - run: echo "TAG_NAME=${HEAD_REF//\//-}" >> "$GITHUB_ENV"
         env:
           HEAD_REF: ${{github.head_ref}}
@@ -114,7 +114,7 @@ jobs:
     needs: deploy_docker_image
     if: always() && (needs.deploy_docker_image.result == 'success' || (github.event_name == 'pull_request' && github.event.action == 'closed'))
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -132,11 +132,11 @@ jobs:
   update-dockle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: dev-hato/actions-update-dockle@v0.0.43
+      - uses: dev-hato/actions-update-dockle@v0.0.47
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
 
@@ -149,7 +149,7 @@ jobs:
       DOCKER_CONTENT_TRUST: 1
       REPOSITORY: ${{github.repository}}
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
       - run: bash "${GITHUB_WORKSPACE}/scripts/deploy_hato_bot/dockle/run_dockle.sh"
         env:
           HEAD_REF: ${{github.head_ref || github.event.release.tag_name}}
diff --git a/.github/workflows/format-json-yml.yml b/.github/workflows/format-json-yml.yml
@@ -18,11 +18,11 @@ jobs:
   format-json-yml:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: dev-hato/actions-format-json-yml@v0.0.34
+      - uses: dev-hato/actions-format-json-yml@v0.0.36
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
 concurrency:
diff --git a/.github/workflows/github-actions-cache-cleaner.yml b/.github/workflows/github-actions-cache-cleaner.yml
@@ -14,8 +14,8 @@ jobs:
   github-actions-cache-cleaner:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
-      - uses: dev-hato/github-actions-cache-cleaner@v0.0.9
+      - uses: actions/checkout@v3.5.0
+      - uses: dev-hato/github-actions-cache-cleaner@v0.0.13
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
 
diff --git a/.github/workflows/pr-check-npm.yml b/.github/workflows/pr-check-npm.yml
@@ -21,7 +21,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: pr-update-version
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           # ここでsubmodule持ってくるとdetached headにcommitして死ぬ
           # submodule: 'recursive'
diff --git a/.github/workflows/pr-copy-ci-hato-bot.yml b/.github/workflows/pr-copy-ci-hato-bot.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           path: hato-bot
@@ -24,7 +24,7 @@ jobs:
           result-encoding: string
           script:
             return process.env.GITHUB_REPOSITORY.split('/')[0]
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           repository: ${{steps.set_org_name.outputs.result}}/sudden-death
diff --git a/.github/workflows/pr-format.yml b/.github/workflows/pr-format.yml
@@ -19,7 +19,7 @@ jobs:
   pr-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           # ここでsubmodule持ってくるとdetached headにcommitして死ぬ
           # submodule: 'recursive'
diff --git a/.github/workflows/pr-merge-develop-hato-bot.yml b/.github/workflows/pr-merge-develop-hato-bot.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Set org name
diff --git a/.github/workflows/pr-release-hato-bot.yml b/.github/workflows/pr-release-hato-bot.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
       - name: Get diff
diff --git a/.github/workflows/pr-renovate-config-validator.yml b/.github/workflows/pr-renovate-config-validator.yml
@@ -9,7 +9,7 @@ jobs:
   pr-renovate-config-validator:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
       - name: Set up Node.js
         uses: actions/setup-node@v3.6.0
         with:
diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           submodules: "recursive"
       - run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}"
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
@@ -10,7 +10,7 @@ jobs:
   pr-super-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           submodules: "recursive"
           fetch-depth: 0
diff --git a/.github/workflows/pr-update-gitleaks.yml b/.github/workflows/pr-update-gitleaks.yml
@@ -17,7 +17,7 @@ jobs:
   pr-update-gitleaks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -26,7 +26,7 @@ jobs:
           cache: npm
       - name: Install packages
         run: bash "${GITHUB_WORKSPACE}/scripts/npm_ci.sh"
-      - uses: dev-hato/actions-update-gitleaks@v0.0.38
+      - uses: dev-hato/actions-update-gitleaks@v0.0.40
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
 concurrency:
diff --git a/.github/workflows/update-readme-hato-bot.yml b/.github/workflows/update-readme-hato-bot.yml
@@ -15,7 +15,7 @@ jobs:
   update-readme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.0
         if: github.event_name != 'pull_request' || github.event.action != 'closed'
         with:
           fetch-depth: 0
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.11.2
+3.11.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,13 +7,19 @@
   * `Removed` 削除された機能について。
   * `Fixed` バグ修正について。
 
+## v3.0.1 - 2023-04-06
+
+### Fixed
+
+* helpコマンドが動かない問題を修正しました。(#2429)
+
 ## v3.0.0 - 2023-03-09
 
 ### Added
 
 * Discordに対応しました。(#2372)
 * Misskeyに対応しました。(#2386)
-* ChartGPTで文章を作成する機能を追加しました。(#2364)
+* ChatGPTで文章を作成する機能を追加しました。(#2364)
 * openAIのImage generationで画像生成する機能を追加しました。(#2383)
 
 ## v2.4.4 - 2022-11-30
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends git \
     && sed -i "s/^\(GIT_COMMIT_HASH = \).*\$/\1'$(git rev-parse HEAD)'/" slackbot_settings.py
 
-FROM python:3.11.2-slim-bullseye
+FROM python:3.11.3-slim-bullseye
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -27,7 +27,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends git gcc libc6-dev libopencv-dev libgl1-mesa-dev libglib2.0-0 curl && \
     curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
     apt-get install -y --no-install-recommends nodejs && \
-    pip install pipenv==2023.2.18 --no-cache-dir && \
+    pip install pipenv==2023.3.20 --no-cache-dir && \
     if [ "${ENV}" = 'dev' ]; then \
       pipenv install --system --skip-lock --dev; \
     else \
@@ -50,6 +50,7 @@ COPY library library
 COPY plugins plugins
 COPY postgres/docker-entrypoint-initdb.d postgres/docker-entrypoint-initdb.d
 COPY .textlintrc .textlintrc
+COPY commands.txt commands.txt
 COPY --from=commit-hash slackbot_settings.py slackbot_settings.py
 
 ENV GIT_PYTHON_REFRESH=quiet
diff --git a/Pipfile b/Pipfile
@@ -9,8 +9,8 @@ python_version = "3.11"
 [dev-packages]
 autopep8 = "==2.0.2"
 requests-mock = "==1.10.0"
-pylint = "==2.17.0"
-sqlfluff = "==1.4.5"
+pylint = "==2.17.2"
+sqlfluff = "==2.0.3"
 mypy = "==1.1.1"
 flake8 = "==6.0.0"
 black = "*"
@@ -25,13 +25,13 @@ opencv-python = "==4.7.0.72"
 pyperclip = "==1.8.2"
 click = "==8.1.3"
 sudden-death = {git = "https://github.com/dev-hato/sudden-death", ref = "master"}
-psycopg2-binary = "==2.9.5"
+psycopg2-binary = "==2.9.6"
 slackeventsapi = "==3.0.1"
 slackclient = "==2.9.4"
 gitpython = "==3.1.31"
-pandas = "==1.5.3"
+pandas = "==2.0.0"
 matplotlib = "==3.7.1"
-openai = "==0.27.1"
+openai = "==0.27.4"
 discord = "==2.2.2"
 "misskey.py" = "==4.1.0"
-websockets = "==10.4"
+websockets = "==11.0.1"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/run.py b/run.py
diff --git a/slackbot_settings.py b/slackbot_settings.py
