From 09a2f057b05e4b90986ff489867a36d7b47ea2d6 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Fri, 11 Feb 2022 21:30:29 +0900 Subject: [PATCH 01/57] =?UTF-8?q?CI:=20push=E3=83=88=E3=83=AA=E3=82=AC?= =?UTF-8?q?=E3=83=BC=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-docker-hato-bot.yml | 25 --- .github/workflows/pr-format.yml | 229 +++++++++++++++++++++++ .github/workflows/pr-test-hato-bot.yml | 59 ++++++ .github/workflows/pr-test.yml | 224 +--------------------- 4 files changed, 292 insertions(+), 245 deletions(-) create mode 100644 .github/workflows/pr-format.yml diff --git a/.github/workflows/pr-docker-hato-bot.yml b/.github/workflows/pr-docker-hato-bot.yml index 96f0e702e4..44a8c80016 100644 --- a/.github/workflows/pr-docker-hato-bot.yml +++ b/.github/workflows/pr-docker-hato-bot.yml @@ -42,31 +42,6 @@ jobs: if: ${{ github.event_name == 'release' }} - name: Build docker image run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 - - name: Start docker - run: docker-compose up -d - # Dockerコンテナ立ち上げから2分以内に疎通できるようになるかテストする - - name: Test - run: | - cmd="curl -XPOST -d '{\"message\": \"help\"}'" - cmd+=" -H \"Content-Type: application/json\"" - cmd+=" http://localhost:3000/healthcheck" - cmd_="${cmd} -w '%{http_code}' -o /dev/null -s" - start_unixtime=$(date +%s) - - while [ "$(echo "$(date +%s) - ${start_unixtime}" | bc)" -lt 120 ] \ - && (! (docker-compose ps | grep -q Exit)) - do - if [ "$(eval "${cmd_}")" = 200 ] && eval "${cmd}" - then - docker-compose logs - exit 0 - fi - - sleep 1 - done - - docker-compose logs - exit 1 - run: docker-compose push - run: | for image in postgres hato-bot; do diff --git a/.github/workflows/pr-format.yml b/.github/workflows/pr-format.yml new file mode 100644 index 0000000000..a50d831be6 --- /dev/null +++ b/.github/workflows/pr-format.yml @@ -0,0 +1,229 @@ +--- +name: pr-test + +# pull_requestで何かあった時に起動する +on: + pull_request: + +env: + WORKON_HOME: /tmp/.venv + +jobs: + # PRが来たらformatをかけてみて、差分があればPRを作って、エラーで落ちるjob + pr-format: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.9] + + steps: + - uses: actions/checkout@v2 + with: + # ここでsubmodule持ってくるとdetached headにcommitして死ぬ + # submodule: 'recursive' + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2.3.2 + with: + python-version: ${{ matrix.python-version }} + - run: | + KEY="${{ hashFiles('./.github/workflows/pr-test.yml') }}" + KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" + KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv" + echo "KEY=${KEY}" >> "${GITHUB_ENV}" + - name: pipenv cache + uses: actions/cache@v2.1.7 + with: + key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} + path: ${{ env.WORKON_HOME }} + restore-keys: | + ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} + ${{ env.KEY }}- + - name: Install pipenv + id: install_pipenv + continue-on-error: true + run: | + file_name=Dockerfile + package_name=pipenv + + if [ -f ${file_name} ] + then + PATTERN="${package_name}[^ ]+" + package_name_with_version=$(grep -oE "${PATTERN}" ${file_name}) + else + package_name_with_version=${package_name} + fi + + pip install ${package_name_with_version} + + if [ -f ${file_name} ] + then + new_version="$(pip list --outdated | grep pipenv || true)" + new_version="$(echo -e "${new_version}" | awk '{print $3}')" + if [ -n "${new_version}" ] + then + PATTERN_BEFORE="${package_name}[^ ]+" + PATTERN_AFTER="${package_name}==${new_version}" + sed -i -E "s/${PATTERN_BEFORE}/${PATTERN_AFTER}/g" ${file_name} + pip install "${package_name}==${new_version}" + exit 1 + fi + fi + - name: pipenv version + run: pipenv --version + - name: Install dependencies + run: | + pipenv install --dev + # autopep8でformatする + # --exit-codeをつけることで、autopep8内でエラーが起きれば1、差分があれば2のエラーステータスコードが返ってくる。正常時は0が返る + - name: Format files + id: format + run: | + pipenv run autopep8 --exit-code --in-place --recursive . + continue-on-error: true + # 差分があったときは差分を出力する + - name: Show diff + if: ${{ steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure' }} + run: | + git diff + - run: | + REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}" + echo "REPO_NAME=${REPO_NAME}" >> "${GITHUB_ENV}" + # 差分があったときは、コミットを作りpushする + - name: Push + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && (steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure') }} + run: | + git config user.name "github-actions[bot]" + EMAIL="41898282+github-actions[bot]@users.noreply.github.com" + git config user.email "${EMAIL}" + git add -u + git commit -m "鳩は唐揚げ！(自動で直してあげたよ！)" + REPO_URL="https://" + REPO_URL+="${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/" + REPO_URL+="${{github.repository}}.git" + GITHUB_HEAD="HEAD:refs/heads/fix-format-${HEAD_REF}" + git push -f "${REPO_URL}" "${GITHUB_HEAD}" + - name: Get PullRequests + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && (steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure') }} + id: get_pull_requests + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const pulls_list_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-format-" + HEAD_REF, + base: HEAD_REF, + state: "open" + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + return pulls.length + # pushしたブランチでPRを作る + - name: Create PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && (steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure') + && steps.get_pull_requests.outputs.result == 0 }} + id: create_pull_request + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const number = "#${{github.event.pull_request.number}}" + let title = "formatが間違ってたので直してあげたよ！PRをマージしてね！ " + title += number + const pulls_create_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-format-" + HEAD_REF, + base: HEAD_REF, + title, + body: "鳩の唐揚げおいしい！😋😋😋 " + number + } + console.log("call pulls.create:", pulls_create_params) + const create_pull_res = await github.rest.pulls.create( + pulls_create_params + ) + return create_pull_res.data.number + - name: Assign a user + uses: actions/github-script@v5 + if: ${{ env.REPO_NAME == github.repository + && (steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure') + && steps.get_pull_requests.outputs.result == 0 + && github.event.pull_request.user.login != 'dependabot[bot]' }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const issues_add_assignees_params = { + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: ${{steps.create_pull_request.outputs.result}}, + assignees: ["${{github.event.pull_request.user.login}}"] + } + console.log("call issues.addAssignees:") + console.log(issues_add_assignees_params) + await github.rest.issues.addAssignees(issues_add_assignees_params) + # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる + - name: Close PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && (steps.install_pipenv.outcome != 'failure' + && steps.format.outcome != 'failure') }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const head_name = "fix-format-" + HEAD_REF + const common_params = { + owner: context.repo.owner, + repo: context.repo.repo + } + const pulls_list_params = { + head: "dev-hato:" + head_name, + base: HEAD_REF, + state: "open", + ...common_params + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + + for(const data of pulls) { + const pulls_update_params = { + pull_number: data.number, + state: "closed", + ...common_params + } + console.log("call pulls.update:", pulls_update_params) + await github.rest.pulls.update(pulls_update_params) + const git_deleteRef_params = { + ref: "heads/" + head_name, + ...common_params + } + console.log("call git.deleteRef:", git_deleteRef_params) + await github.rest.git.deleteRef(git_deleteRef_params) + } + - name: Exit + if: ${{ steps.install_pipenv.outcome == 'failure' + || steps.format.outcome == 'failure' }} + run: exit 1 diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index 031c6d6b0c..f7fb90e259 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -4,6 +4,10 @@ name: pr-test-hato-bot # pull_requestで何かあった時に起動する on: pull_request: + push: + branches: + - master + - develop env: WORKON_HOME: /tmp/.venv @@ -63,3 +67,58 @@ jobs: - name: Test run: | pipenv run python -m unittest + + pr-docker: + runs-on: ubuntu-latest + defaults: + run: + working-directory: setup + env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + permissions: + packages: write + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set .env + run: cp .env.example .env + working-directory: . + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - run: echo "TAG_NAME=latest" >> "$GITHUB_ENV" + - name: Build docker image + run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 + - name: Start docker + run: docker-compose up -d + # Dockerコンテナ立ち上げから2分以内に疎通できるようになるかテストする + - name: Test + run: | + cmd="curl -XPOST -d '{\"message\": \"help\"}'" + cmd+=" -H \"Content-Type: application/json\"" + cmd+=" http://localhost:3000/healthcheck" + cmd_="${cmd} -w '%{http_code}' -o /dev/null -s" + start_unixtime=$(date +%s) + + while [ "$(echo "$(date +%s) - ${start_unixtime}" | bc)" -lt 120 ] \ + && (! (docker-compose ps | grep -q Exit)) + do + if [ "$(eval "${cmd_}")" = 200 ] && eval "${cmd}" + then + docker-compose logs + exit 0 + fi + + sleep 1 + done + + docker-compose logs + exit 1 diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 5cd0ab0e75..135575988c 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -1,233 +1,17 @@ --- name: pr-test -# pull_requestで何かあった時に起動する on: pull_request: + push: + branches: + - master + - develop env: WORKON_HOME: /tmp/.venv jobs: - # PRが来たらformatをかけてみて、差分があればPRを作って、エラーで落ちるjob - pr-format: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9] - - steps: - - uses: actions/checkout@v2 - with: - # ここでsubmodule持ってくるとdetached headにcommitして死ぬ - # submodule: 'recursive' - fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.3.2 - with: - python-version: ${{ matrix.python-version }} - - run: | - KEY="${{ hashFiles('./.github/workflows/pr-test.yml') }}" - KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" - KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv" - echo "KEY=${KEY}" >> "${GITHUB_ENV}" - - name: pipenv cache - uses: actions/cache@v2.1.7 - with: - key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - path: ${{ env.WORKON_HOME }} - restore-keys: | - ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - ${{ env.KEY }}- - - name: Install pipenv - id: install_pipenv - continue-on-error: true - run: | - file_name=Dockerfile - package_name=pipenv - - if [ -f ${file_name} ] - then - PATTERN="${package_name}[^ ]+" - package_name_with_version=$(grep -oE "${PATTERN}" ${file_name}) - else - package_name_with_version=${package_name} - fi - - pip install ${package_name_with_version} - - if [ -f ${file_name} ] - then - new_version="$(pip list --outdated | grep pipenv || true)" - new_version="$(echo -e "${new_version}" | awk '{print $3}')" - if [ -n "${new_version}" ] - then - PATTERN_BEFORE="${package_name}[^ ]+" - PATTERN_AFTER="${package_name}==${new_version}" - sed -i -E "s/${PATTERN_BEFORE}/${PATTERN_AFTER}/g" ${file_name} - pip install "${package_name}==${new_version}" - exit 1 - fi - fi - - name: pipenv version - run: pipenv --version - - name: Install dependencies - run: | - pipenv install --dev - # autopep8でformatする - # --exit-codeをつけることで、autopep8内でエラーが起きれば1、差分があれば2のエラーステータスコードが返ってくる。正常時は0が返る - - name: Format files - id: format - run: | - pipenv run autopep8 --exit-code --in-place --recursive . - continue-on-error: true - # 差分があったときは差分を出力する - - name: Show diff - if: ${{ steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure' }} - run: | - git diff - - run: | - REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}" - echo "REPO_NAME=${REPO_NAME}" >> "${GITHUB_ENV}" - # 差分があったときは、コミットを作りpushする - - name: Push - env: - HEAD_REF: ${{github.event.pull_request.head.ref}} - if: ${{ env.REPO_NAME == github.repository - && (steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure') }} - run: | - git config user.name "github-actions[bot]" - EMAIL="41898282+github-actions[bot]@users.noreply.github.com" - git config user.email "${EMAIL}" - git add -u - git commit -m "鳩は唐揚げ！(自動で直してあげたよ！)" - REPO_URL="https://" - REPO_URL+="${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/" - REPO_URL+="${{github.repository}}.git" - GITHUB_HEAD="HEAD:refs/heads/fix-format-${HEAD_REF}" - git push -f "${REPO_URL}" "${GITHUB_HEAD}" - - name: Get PullRequests - uses: actions/github-script@v5 - env: - HEAD_REF: ${{github.event.pull_request.head.ref}} - if: ${{ env.REPO_NAME == github.repository - && (steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure') }} - id: get_pull_requests - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const HEAD_REF = process.env["HEAD_REF"] - const pulls_list_params = { - owner: context.repo.owner, - repo: context.repo.repo, - head: "dev-hato:fix-format-" + HEAD_REF, - base: HEAD_REF, - state: "open" - } - console.log("call pulls.list:", pulls_list_params) - const pulls = await github.paginate(github.rest.pulls.list, - pulls_list_params) - return pulls.length - # pushしたブランチでPRを作る - - name: Create PullRequest - uses: actions/github-script@v5 - env: - HEAD_REF: ${{github.event.pull_request.head.ref}} - if: ${{ env.REPO_NAME == github.repository - && (steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure') - && steps.get_pull_requests.outputs.result == 0 }} - id: create_pull_request - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const HEAD_REF = process.env["HEAD_REF"] - const number = "#${{github.event.pull_request.number}}" - let title = "formatが間違ってたので直してあげたよ！PRをマージしてね！ " - title += number - const pulls_create_params = { - owner: context.repo.owner, - repo: context.repo.repo, - head: "dev-hato:fix-format-" + HEAD_REF, - base: HEAD_REF, - title, - body: "鳩の唐揚げおいしい！😋😋😋 " + number - } - console.log("call pulls.create:", pulls_create_params) - const create_pull_res = await github.rest.pulls.create( - pulls_create_params - ) - return create_pull_res.data.number - - name: Assign a user - uses: actions/github-script@v5 - if: ${{ env.REPO_NAME == github.repository - && (steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure') - && steps.get_pull_requests.outputs.result == 0 - && github.event.pull_request.user.login != 'dependabot[bot]' }} - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const issues_add_assignees_params = { - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: ${{steps.create_pull_request.outputs.result}}, - assignees: ["${{github.event.pull_request.user.login}}"] - } - console.log("call issues.addAssignees:") - console.log(issues_add_assignees_params) - await github.rest.issues.addAssignees(issues_add_assignees_params) - # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる - - name: Close PullRequest - uses: actions/github-script@v5 - env: - HEAD_REF: ${{github.event.pull_request.head.ref}} - if: ${{ env.REPO_NAME == github.repository - && (steps.install_pipenv.outcome != 'failure' - && steps.format.outcome != 'failure') }} - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const HEAD_REF = process.env["HEAD_REF"] - const head_name = "fix-format-" + HEAD_REF - const common_params = { - owner: context.repo.owner, - repo: context.repo.repo - } - const pulls_list_params = { - head: "dev-hato:" + head_name, - base: HEAD_REF, - state: "open", - ...common_params - } - console.log("call pulls.list:", pulls_list_params) - const pulls = await github.paginate(github.rest.pulls.list, - pulls_list_params) - - for(const data of pulls) { - const pulls_update_params = { - pull_number: data.number, - state: "closed", - ...common_params - } - console.log("call pulls.update:", pulls_update_params) - await github.rest.pulls.update(pulls_update_params) - const git_deleteRef_params = { - ref: "heads/" + head_name, - ...common_params - } - console.log("call git.deleteRef:", git_deleteRef_params) - await github.rest.git.deleteRef(git_deleteRef_params) - } - - name: Exit - if: ${{ steps.install_pipenv.outcome == 'failure' - || steps.format.outcome == 'failure' }} - run: exit 1 - pr-super-lint: runs-on: ubuntu-latest strategy: From 9ad67a93730b17dad6da334d0134ebcfc4374bd5 Mon Sep 17 00:00:00 2001 From: fono09 Date: Fri, 11 Feb 2022 21:49:03 +0900 Subject: [PATCH 02/57] close #807 --- .../workflows/pr-merge-develop-hato-bot.yml | 2 +- .github/workflows/pr-release-hato-bot.yml | 2 +- .github/workflows/pr-test-hato-bot.yml | 2 +- .github/workflows/pr-test.yml | 4 +- .gitignore | 1 - .python-version | 1 + Dockerfile | 2 +- Pipfile | 3 + Pipfile.lock | 742 ++++++++++++++++++ 9 files changed, 752 insertions(+), 7 deletions(-) create mode 100644 .python-version create mode 100644 Pipfile.lock diff --git a/.github/workflows/pr-merge-develop-hato-bot.yml b/.github/workflows/pr-merge-develop-hato-bot.yml index 48be0a82c2..781e33d712 100644 --- 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 strategy: matrix: - python-version: [3.9] + python-version: [3.9.10] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-release-hato-bot.yml b/.github/workflows/pr-release-hato-bot.yml index 5ba5a4eae3..3b196d37f3 100644 --- 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 strategy: matrix: - python-version: [3.9] + python-version: [3.9.10] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index 031c6d6b0c..f3a210a0e2 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9, 3.8] + python-version: [3.9.10] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 5cd0ab0e75..e74a6ed745 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: [3.9.10] steps: - uses: actions/checkout@v2 @@ -232,7 +232,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: [3.9.10] node-version: [16.x] steps: diff --git a/.gitignore b/.gitignore index 25e441ae39..7a62262fea 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ __pycache__/ .vscode/ setup/pgsql-data .mypy_cache/ -Pipfile.lock node_modules/ diff --git a/.python-version b/.python-version new file mode 100644 index 0000000000..0a590336d5 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.9.10 diff --git a/Dockerfile b/Dockerfile index 7667a67efa..3b2058ba63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ COPY . / RUN apk add --no-cache -U git \ && sed -i "s/^\(GIT_COMMIT_HASH = \).*\$/\1'$(git rev-parse HEAD)'/" slackbot_settings.py -FROM python:3.10.0b2-alpine3.12 +FROM python:3.9.10-alpine WORKDIR /usr/src/app diff --git a/Pipfile b/Pipfile index d2b07a354c..67b6569e52 100644 --- a/Pipfile +++ b/Pipfile @@ -3,6 +3,9 @@ name = "pypi" url = "https://pypi.org/simple" verify_ssl = true +[requires] +python_version = "3.9.10" + [dev-packages] autopep8 = "==1.6.0" requests-mock = "==1.9.3" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000000..effaf85722 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,742 @@ +{ + "_meta": { + "hash": { + "sha256": "3ba68c0c45ab3f73c226017a39573c94fe56965ea33e668a36187c23679c2bff" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.9.10" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "aiohttp": { + "hashes": [ + "sha256:01d7bdb774a9acc838e6b8f1d114f45303841b89b95984cbb7d80ea41172a9e3", + "sha256:03a6d5349c9ee8f79ab3ff3694d6ce1cfc3ced1c9d36200cb8f08ba06bd3b782", + "sha256:04d48b8ce6ab3cf2097b1855e1505181bdd05586ca275f2505514a6e274e8e75", + "sha256:0770e2806a30e744b4e21c9d73b7bee18a1cfa3c47991ee2e5a65b887c49d5cf", + "sha256:07b05cd3305e8a73112103c834e91cd27ce5b4bd07850c4b4dbd1877d3f45be7", + "sha256:086f92daf51a032d062ec5f58af5ca6a44d082c35299c96376a41cbb33034675", + "sha256:099ebd2c37ac74cce10a3527d2b49af80243e2a4fa39e7bce41617fbc35fa3c1", + "sha256:0c7ebbbde809ff4e970824b2b6cb7e4222be6b95a296e46c03cf050878fc1785", + "sha256:102e487eeb82afac440581e5d7f8f44560b36cf0bdd11abc51a46c1cd88914d4", + "sha256:11691cf4dc5b94236ccc609b70fec991234e7ef8d4c02dd0c9668d1e486f5abf", + "sha256:11a67c0d562e07067c4e86bffc1553f2cf5b664d6111c894671b2b8712f3aba5", + "sha256:12de6add4038df8f72fac606dff775791a60f113a725c960f2bab01d8b8e6b15", + "sha256:13487abd2f761d4be7c8ff9080de2671e53fff69711d46de703c310c4c9317ca", + "sha256:15b09b06dae900777833fe7fc4b4aa426556ce95847a3e8d7548e2d19e34edb8", + "sha256:1c182cb873bc91b411e184dab7a2b664d4fea2743df0e4d57402f7f3fa644bac", + "sha256:1ed0b6477896559f17b9eaeb6d38e07f7f9ffe40b9f0f9627ae8b9926ae260a8", + "sha256:28d490af82bc6b7ce53ff31337a18a10498303fe66f701ab65ef27e143c3b0ef", + "sha256:2e5d962cf7e1d426aa0e528a7e198658cdc8aa4fe87f781d039ad75dcd52c516", + "sha256:2ed076098b171573161eb146afcb9129b5ff63308960aeca4b676d9d3c35e700", + "sha256:2f2f69dca064926e79997f45b2f34e202b320fd3782f17a91941f7eb85502ee2", + "sha256:31560d268ff62143e92423ef183680b9829b1b482c011713ae941997921eebc8", + "sha256:31d1e1c0dbf19ebccbfd62eff461518dcb1e307b195e93bba60c965a4dcf1ba0", + "sha256:37951ad2f4a6df6506750a23f7cbabad24c73c65f23f72e95897bb2cecbae676", + "sha256:3af642b43ce56c24d063325dd2cf20ee012d2b9ba4c3c008755a301aaea720ad", + "sha256:44db35a9e15d6fe5c40d74952e803b1d96e964f683b5a78c3cc64eb177878155", + "sha256:473d93d4450880fe278696549f2e7aed8cd23708c3c1997981464475f32137db", + "sha256:477c3ea0ba410b2b56b7efb072c36fa91b1e6fc331761798fa3f28bb224830dd", + "sha256:4a4a4e30bf1edcad13fb0804300557aedd07a92cabc74382fdd0ba6ca2661091", + "sha256:4aed991a28ea3ce320dc8ce655875e1e00a11bdd29fe9444dd4f88c30d558602", + "sha256:51467000f3647d519272392f484126aa716f747859794ac9924a7aafa86cd411", + "sha256:55c3d1072704d27401c92339144d199d9de7b52627f724a949fc7d5fc56d8b93", + "sha256:589c72667a5febd36f1315aa6e5f56dd4aa4862df295cb51c769d16142ddd7cd", + "sha256:5bfde62d1d2641a1f5173b8c8c2d96ceb4854f54a44c23102e2ccc7e02f003ec", + "sha256:5c23b1ad869653bc818e972b7a3a79852d0e494e9ab7e1a701a3decc49c20d51", + "sha256:61bfc23df345d8c9716d03717c2ed5e27374e0fe6f659ea64edcd27b4b044cf7", + "sha256:6ae828d3a003f03ae31915c31fa684b9890ea44c9c989056fea96e3d12a9fa17", + "sha256:6c7cefb4b0640703eb1069835c02486669312bf2f12b48a748e0a7756d0de33d", + "sha256:6d69f36d445c45cda7b3b26afef2fc34ef5ac0cdc75584a87ef307ee3c8c6d00", + "sha256:6f0d5f33feb5f69ddd57a4a4bd3d56c719a141080b445cbf18f238973c5c9923", + "sha256:6f8b01295e26c68b3a1b90efb7a89029110d3a4139270b24fda961893216c440", + "sha256:713ac174a629d39b7c6a3aa757b337599798da4c1157114a314e4e391cd28e32", + "sha256:718626a174e7e467f0558954f94af117b7d4695d48eb980146016afa4b580b2e", + "sha256:7187a76598bdb895af0adbd2fb7474d7f6025d170bc0a1130242da817ce9e7d1", + "sha256:71927042ed6365a09a98a6377501af5c9f0a4d38083652bcd2281a06a5976724", + "sha256:7d08744e9bae2ca9c382581f7dce1273fe3c9bae94ff572c3626e8da5b193c6a", + "sha256:7dadf3c307b31e0e61689cbf9e06be7a867c563d5a63ce9dca578f956609abf8", + "sha256:81e3d8c34c623ca4e36c46524a3530e99c0bc95ed068fd6e9b55cb721d408fb2", + "sha256:844a9b460871ee0a0b0b68a64890dae9c415e513db0f4a7e3cab41a0f2fedf33", + "sha256:8b7ef7cbd4fec9a1e811a5de813311ed4f7ac7d93e0fda233c9b3e1428f7dd7b", + "sha256:97ef77eb6b044134c0b3a96e16abcb05ecce892965a2124c566af0fd60f717e2", + "sha256:99b5eeae8e019e7aad8af8bb314fb908dd2e028b3cdaad87ec05095394cce632", + "sha256:a25fa703a527158aaf10dafd956f7d42ac6d30ec80e9a70846253dd13e2f067b", + "sha256:a2f635ce61a89c5732537a7896b6319a8fcfa23ba09bec36e1b1ac0ab31270d2", + "sha256:a79004bb58748f31ae1cbe9fa891054baaa46fb106c2dc7af9f8e3304dc30316", + "sha256:a996d01ca39b8dfe77440f3cd600825d05841088fd6bc0144cc6c2ec14cc5f74", + "sha256:b0e20cddbd676ab8a64c774fefa0ad787cc506afd844de95da56060348021e96", + "sha256:b6613280ccedf24354406caf785db748bebbddcf31408b20c0b48cb86af76866", + "sha256:b9d00268fcb9f66fbcc7cd9fe423741d90c75ee029a1d15c09b22d23253c0a44", + "sha256:bb01ba6b0d3f6c68b89fce7305080145d4877ad3acaed424bae4d4ee75faa950", + "sha256:c2aef4703f1f2ddc6df17519885dbfa3514929149d3ff900b73f45998f2532fa", + "sha256:c34dc4958b232ef6188c4318cb7b2c2d80521c9a56c52449f8f93ab7bc2a8a1c", + "sha256:c3630c3ef435c0a7c549ba170a0633a56e92629aeed0e707fec832dee313fb7a", + "sha256:c3d6a4d0619e09dcd61021debf7059955c2004fa29f48788a3dfaf9c9901a7cd", + "sha256:d15367ce87c8e9e09b0f989bfd72dc641bcd04ba091c68cd305312d00962addd", + "sha256:d2f9b69293c33aaa53d923032fe227feac867f81682f002ce33ffae978f0a9a9", + "sha256:e999f2d0e12eea01caeecb17b653f3713d758f6dcc770417cf29ef08d3931421", + "sha256:ea302f34477fda3f85560a06d9ebdc7fa41e82420e892fc50b577e35fc6a50b2", + "sha256:eaba923151d9deea315be1f3e2b31cc39a6d1d2f682f942905951f4e40200922", + "sha256:ef9612483cb35171d51d9173647eed5d0069eaa2ee812793a75373447d487aa4", + "sha256:f5315a2eb0239185af1bddb1abf472d877fede3cc8d143c6cddad37678293237", + "sha256:fa0ffcace9b3aa34d205d8130f7873fcfefcb6a4dd3dd705b0dab69af6712642", + "sha256:fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578" + ], + "markers": "python_version >= '3.6'", + "version": "==3.8.1" + }, + "aiosignal": { + "hashes": [ + "sha256:26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a", + "sha256:78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2" + ], + "markers": "python_version >= '3.6'", + "version": "==1.2.0" + }, + "async-timeout": { + "hashes": [ + "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", + "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" + ], + "markers": "python_version >= '3.6'", + "version": "==4.0.2" + }, + "attrs": { + "hashes": [ + "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4", + "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==21.4.0" + }, + "certifi": { + "hashes": [ + "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", + "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" + ], + "version": "==2021.10.8" + }, + "charset-normalizer": { + "hashes": [ + "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45", + "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c" + ], + "markers": "python_version >= '3'", + "version": "==2.0.11" + }, + "click": { + "hashes": [ + "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3", + "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b" + ], + "index": "pypi", + "version": "==8.0.3" + }, + "flask": { + "hashes": [ + "sha256:7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2", + "sha256:cb90f62f1d8e4dc4621f52106613488b5ba826b2e1e10a33eac92f723093ab6a" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.2" + }, + "frozenlist": { + "hashes": [ + "sha256:006d3595e7d4108a12025ddf415ae0f6c9e736e726a5db0183326fd191b14c5e", + "sha256:01a73627448b1f2145bddb6e6c2259988bb8aee0fb361776ff8604b99616cd08", + "sha256:03a7dd1bfce30216a3f51a84e6dd0e4a573d23ca50f0346634916ff105ba6e6b", + "sha256:0437fe763fb5d4adad1756050cbf855bbb2bf0d9385c7bb13d7a10b0dd550486", + "sha256:04cb491c4b1c051734d41ea2552fde292f5f3a9c911363f74f39c23659c4af78", + "sha256:0c36e78b9509e97042ef869c0e1e6ef6429e55817c12d78245eb915e1cca7468", + "sha256:25af28b560e0c76fa41f550eacb389905633e7ac02d6eb3c09017fa1c8cdfde1", + "sha256:2fdc3cd845e5a1f71a0c3518528bfdbfe2efaf9886d6f49eacc5ee4fd9a10953", + "sha256:30530930410855c451bea83f7b272fb1c495ed9d5cc72895ac29e91279401db3", + "sha256:31977f84828b5bb856ca1eb07bf7e3a34f33a5cddce981d880240ba06639b94d", + "sha256:3c62964192a1c0c30b49f403495911298810bada64e4f03249ca35a33ca0417a", + "sha256:3f7c935c7b58b0d78c0beea0c7358e165f95f1fd8a7e98baa40d22a05b4a8141", + "sha256:40dff8962b8eba91fd3848d857203f0bd704b5f1fa2b3fc9af64901a190bba08", + "sha256:40ec383bc194accba825fbb7d0ef3dda5736ceab2375462f1d8672d9f6b68d07", + "sha256:436496321dad302b8b27ca955364a439ed1f0999311c393dccb243e451ff66aa", + "sha256:4406cfabef8f07b3b3af0f50f70938ec06d9f0fc26cbdeaab431cbc3ca3caeaa", + "sha256:45334234ec30fc4ea677f43171b18a27505bfb2dba9aca4398a62692c0ea8868", + "sha256:47be22dc27ed933d55ee55845d34a3e4e9f6fee93039e7f8ebadb0c2f60d403f", + "sha256:4a44ebbf601d7bac77976d429e9bdb5a4614f9f4027777f9e54fd765196e9d3b", + "sha256:4eda49bea3602812518765810af732229b4291d2695ed24a0a20e098c45a707b", + "sha256:57f4d3f03a18facacb2a6bcd21bccd011e3b75d463dc49f838fd699d074fabd1", + "sha256:603b9091bd70fae7be28bdb8aa5c9990f4241aa33abb673390a7f7329296695f", + "sha256:65bc6e2fece04e2145ab6e3c47428d1bbc05aede61ae365b2c1bddd94906e478", + "sha256:691ddf6dc50480ce49f68441f1d16a4c3325887453837036e0fb94736eae1e58", + "sha256:6983a31698490825171be44ffbafeaa930ddf590d3f051e397143a5045513b01", + "sha256:6a202458d1298ced3768f5a7d44301e7c86defac162ace0ab7434c2e961166e8", + "sha256:6eb275c6385dd72594758cbe96c07cdb9bd6becf84235f4a594bdf21e3596c9d", + "sha256:754728d65f1acc61e0f4df784456106e35afb7bf39cfe37227ab00436fb38676", + "sha256:768efd082074bb203c934e83a61654ed4931ef02412c2fbdecea0cff7ecd0274", + "sha256:772965f773757a6026dea111a15e6e2678fbd6216180f82a48a40b27de1ee2ab", + "sha256:871d42623ae15eb0b0e9df65baeee6976b2e161d0ba93155411d58ff27483ad8", + "sha256:88aafd445a233dbbf8a65a62bc3249a0acd0d81ab18f6feb461cc5a938610d24", + "sha256:8c905a5186d77111f02144fab5b849ab524f1e876a1e75205cd1386a9be4b00a", + "sha256:8cf829bd2e2956066dd4de43fd8ec881d87842a06708c035b37ef632930505a2", + "sha256:92e650bd09b5dda929523b9f8e7f99b24deac61240ecc1a32aeba487afcd970f", + "sha256:93641a51f89473837333b2f8100f3f89795295b858cd4c7d4a1f18e299dc0a4f", + "sha256:94c7a8a9fc9383b52c410a2ec952521906d355d18fccc927fca52ab575ee8b93", + "sha256:9f892d6a94ec5c7b785e548e42722e6f3a52f5f32a8461e82ac3e67a3bd073f1", + "sha256:acb267b09a509c1df5a4ca04140da96016f40d2ed183cdc356d237286c971b51", + "sha256:adac9700675cf99e3615eb6a0eb5e9f5a4143c7d42c05cea2e7f71c27a3d0846", + "sha256:aff388be97ef2677ae185e72dc500d19ecaf31b698986800d3fc4f399a5e30a5", + "sha256:b5009062d78a8c6890d50b4e53b0ddda31841b3935c1937e2ed8c1bda1c7fb9d", + "sha256:b684c68077b84522b5c7eafc1dc735bfa5b341fb011d5552ebe0968e22ed641c", + "sha256:b9e3e9e365991f8cc5f5edc1fd65b58b41d0514a6a7ad95ef5c7f34eb49b3d3e", + "sha256:bd89acd1b8bb4f31b47072615d72e7f53a948d302b7c1d1455e42622de180eae", + "sha256:bde99812f237f79eaf3f04ebffd74f6718bbd216101b35ac7955c2d47c17da02", + "sha256:c6c321dd013e8fc20735b92cb4892c115f5cdb82c817b1e5b07f6b95d952b2f0", + "sha256:ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b", + "sha256:d2257aaba9660f78c7b1d8fea963b68f3feffb1a9d5d05a18401ca9eb3e8d0a3", + "sha256:d26b650b71fdc88065b7a21f8ace70175bcf3b5bdba5ea22df4bfd893e795a3b", + "sha256:d6d32ff213aef0fd0bcf803bffe15cfa2d4fde237d1d4838e62aec242a8362fa", + "sha256:e1e26ac0a253a2907d654a37e390904426d5ae5483150ce3adedb35c8c06614a", + "sha256:e30b2f9683812eb30cf3f0a8e9f79f8d590a7999f731cf39f9105a7c4a39489d", + "sha256:e84cb61b0ac40a0c3e0e8b79c575161c5300d1d89e13c0e02f76193982f066ed", + "sha256:e982878792c971cbd60ee510c4ee5bf089a8246226dea1f2138aa0bb67aff148", + "sha256:f20baa05eaa2bcd5404c445ec51aed1c268d62600362dc6cfe04fae34a424bd9", + "sha256:f7353ba3367473d1d616ee727945f439e027f0bb16ac1a750219a8344d1d5d3c", + "sha256:f96293d6f982c58ebebb428c50163d010c2f05de0cde99fd681bfdc18d4b2dc2", + "sha256:ff9310f05b9d9c5c4dd472983dc956901ee6cb2c3ec1ab116ecdde25f3ce4951" + ], + "markers": "python_version >= '3.7'", + "version": "==1.3.0" + }, + "gitdb": { + "hashes": [ + "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd", + "sha256:bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa" + ], + "markers": "python_version >= '3.6'", + "version": "==4.0.9" + }, + "gitpython": { + "hashes": [ + "sha256:26ac35c212d1f7b16036361ca5cff3ec66e11753a0d677fb6c48fa4e1a9dd8d6", + "sha256:fc8868f63a2e6d268fb25f481995ba185a85a66fcad126f039323ff6635669ee" + ], + "index": "pypi", + "version": "==3.1.26" + }, + "idna": { + "hashes": [ + "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", + "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" + ], + "markers": "python_version >= '3'", + "version": "==3.3" + }, + "itsdangerous": { + "hashes": [ + "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c", + "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.1" + }, + "jinja2": { + "hashes": [ + "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8", + "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7" + ], + "markers": "python_version >= '3.6'", + "version": "==3.0.3" + }, + "markupsafe": { + "hashes": [ + "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", + "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", + "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", + "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194", + "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", + "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", + "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724", + "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74", + "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646", + "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", + "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", + "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a", + "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6", + "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad", + "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", + "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38", + "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", + "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", + "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", + "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047", + "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", + "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", + "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b", + "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", + "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", + "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", + "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", + "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1", + "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", + "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864", + "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", + "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee", + "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f", + "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", + "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", + "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", + "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", + "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", + "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", + "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86", + "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6", + "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", + "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", + "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", + "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28", + "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e", + "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", + "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", + "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f", + "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d", + "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", + "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", + "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145", + "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", + "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c", + "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", + "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a", + "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207", + "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", + "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53", + "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd", + "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134", + "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85", + "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9", + "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", + "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", + "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", + "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", + "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.1" + }, + "multidict": { + "hashes": [ + "sha256:0327292e745a880459ef71be14e709aaea2f783f3537588fb4ed09b6c01bca60", + "sha256:041b81a5f6b38244b34dc18c7b6aba91f9cdaf854d9a39e5ff0b58e2b5773b9c", + "sha256:0556a1d4ea2d949efe5fd76a09b4a82e3a4a30700553a6725535098d8d9fb672", + "sha256:05f6949d6169878a03e607a21e3b862eaf8e356590e8bdae4227eedadacf6e51", + "sha256:07a017cfa00c9890011628eab2503bee5872f27144936a52eaab449be5eaf032", + "sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2", + "sha256:19adcfc2a7197cdc3987044e3f415168fc5dc1f720c932eb1ef4f71a2067e08b", + "sha256:19d9bad105dfb34eb539c97b132057a4e709919ec4dd883ece5838bcbf262b80", + "sha256:225383a6603c086e6cef0f2f05564acb4f4d5f019a4e3e983f572b8530f70c88", + "sha256:23b616fdc3c74c9fe01d76ce0d1ce872d2d396d8fa8e4899398ad64fb5aa214a", + "sha256:2957489cba47c2539a8eb7ab32ff49101439ccf78eab724c828c1a54ff3ff98d", + "sha256:2d36e929d7f6a16d4eb11b250719c39560dd70545356365b494249e2186bc389", + "sha256:2e4a0785b84fb59e43c18a015ffc575ba93f7d1dbd272b4cdad9f5134b8a006c", + "sha256:3368bf2398b0e0fcbf46d85795adc4c259299fec50c1416d0f77c0a843a3eed9", + "sha256:373ba9d1d061c76462d74e7de1c0c8e267e9791ee8cfefcf6b0b2495762c370c", + "sha256:4070613ea2227da2bfb2c35a6041e4371b0af6b0be57f424fe2318b42a748516", + "sha256:45183c96ddf61bf96d2684d9fbaf6f3564d86b34cb125761f9a0ef9e36c1d55b", + "sha256:4571f1beddff25f3e925eea34268422622963cd8dc395bb8778eb28418248e43", + "sha256:47e6a7e923e9cada7c139531feac59448f1f47727a79076c0b1ee80274cd8eee", + "sha256:47fbeedbf94bed6547d3aa632075d804867a352d86688c04e606971595460227", + "sha256:497988d6b6ec6ed6f87030ec03280b696ca47dbf0648045e4e1d28b80346560d", + "sha256:4bae31803d708f6f15fd98be6a6ac0b6958fcf68fda3c77a048a4f9073704aae", + "sha256:50bd442726e288e884f7be9071016c15a8742eb689a593a0cac49ea093eef0a7", + "sha256:514fe2b8d750d6cdb4712346a2c5084a80220821a3e91f3f71eec11cf8d28fd4", + "sha256:5774d9218d77befa7b70d836004a768fb9aa4fdb53c97498f4d8d3f67bb9cfa9", + "sha256:5fdda29a3c7e76a064f2477c9aab1ba96fd94e02e386f1e665bca1807fc5386f", + "sha256:5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013", + "sha256:626fe10ac87851f4cffecee161fc6f8f9853f0f6f1035b59337a51d29ff3b4f9", + "sha256:6701bf8a5d03a43375909ac91b6980aea74b0f5402fbe9428fc3f6edf5d9677e", + "sha256:684133b1e1fe91eda8fa7447f137c9490a064c6b7f392aa857bba83a28cfb693", + "sha256:6f3cdef8a247d1eafa649085812f8a310e728bdf3900ff6c434eafb2d443b23a", + "sha256:75bdf08716edde767b09e76829db8c1e5ca9d8bb0a8d4bd94ae1eafe3dac5e15", + "sha256:7c40b7bbece294ae3a87c1bc2abff0ff9beef41d14188cda94ada7bcea99b0fb", + "sha256:8004dca28e15b86d1b1372515f32eb6f814bdf6f00952699bdeb541691091f96", + "sha256:8064b7c6f0af936a741ea1efd18690bacfbae4078c0c385d7c3f611d11f0cf87", + "sha256:89171b2c769e03a953d5969b2f272efa931426355b6c0cb508022976a17fd376", + "sha256:8cbf0132f3de7cc6c6ce00147cc78e6439ea736cee6bca4f068bcf892b0fd658", + "sha256:9cc57c68cb9139c7cd6fc39f211b02198e69fb90ce4bc4a094cf5fe0d20fd8b0", + "sha256:a007b1638e148c3cfb6bf0bdc4f82776cef0ac487191d093cdc316905e504071", + "sha256:a2c34a93e1d2aa35fbf1485e5010337c72c6791407d03aa5f4eed920343dd360", + "sha256:a45e1135cb07086833ce969555df39149680e5471c04dfd6a915abd2fc3f6dbc", + "sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3", + "sha256:aef9cc3d9c7d63d924adac329c33835e0243b5052a6dfcbf7732a921c6e918ba", + "sha256:b9d153e7f1f9ba0b23ad1568b3b9e17301e23b042c23870f9ee0522dc5cc79e8", + "sha256:bfba7c6d5d7c9099ba21f84662b037a0ffd4a5e6b26ac07d19e423e6fdf965a9", + "sha256:c207fff63adcdf5a485969131dc70e4b194327666b7e8a87a97fbc4fd80a53b2", + "sha256:d0509e469d48940147e1235d994cd849a8f8195e0bca65f8f5439c56e17872a3", + "sha256:d16cce709ebfadc91278a1c005e3c17dd5f71f5098bfae1035149785ea6e9c68", + "sha256:d48b8ee1d4068561ce8033d2c344cf5232cb29ee1a0206a7b828c79cbc5982b8", + "sha256:de989b195c3d636ba000ee4281cd03bb1234635b124bf4cd89eeee9ca8fcb09d", + "sha256:e07c8e79d6e6fd37b42f3250dba122053fddb319e84b55dd3a8d6446e1a7ee49", + "sha256:e2c2e459f7050aeb7c1b1276763364884595d47000c1cddb51764c0d8976e608", + "sha256:e5b20e9599ba74391ca0cfbd7b328fcc20976823ba19bc573983a25b32e92b57", + "sha256:e875b6086e325bab7e680e4316d667fc0e5e174bb5611eb16b3ea121c8951b86", + "sha256:f4f052ee022928d34fe1f4d2bc743f32609fb79ed9c49a1710a5ad6b2198db20", + "sha256:fcb91630817aa8b9bc4a74023e4198480587269c272c58b3279875ed7235c293", + "sha256:fd9fc9c4849a07f3635ccffa895d57abce554b467d611a5009ba4f39b78a8849", + "sha256:feba80698173761cddd814fa22e88b0661e98cb810f9f986c54aa34d281e4937", + "sha256:feea820722e69451743a3d56ad74948b68bf456984d63c1a92e8347b7b88452d" + ], + "markers": "python_version >= '3.7'", + "version": "==6.0.2" + }, + "pillow": { + "hashes": [ + "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97", + "sha256:0f29d831e2151e0b7b39981756d201f7108d3d215896212ffe2e992d06bfe049", + "sha256:12875d118f21cf35604176872447cdb57b07126750a33748bac15e77f90f1f9c", + "sha256:14d4b1341ac07ae07eb2cc682f459bec932a380c3b122f5540432d8977e64eae", + "sha256:1c3c33ac69cf059bbb9d1a71eeaba76781b450bc307e2291f8a4764d779a6b28", + "sha256:1d19397351f73a88904ad1aee421e800fe4bbcd1aeee6435fb62d0a05ccd1030", + "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56", + "sha256:2632d0f846b7c7600edf53c48f8f9f1e13e62f66a6dbc15191029d950bfed976", + "sha256:335ace1a22325395c4ea88e00ba3dc89ca029bd66bd5a3c382d53e44f0ccd77e", + "sha256:413ce0bbf9fc6278b2d63309dfeefe452835e1c78398efb431bab0672fe9274e", + "sha256:5100b45a4638e3c00e4d2320d3193bdabb2d75e79793af7c3eb139e4f569f16f", + "sha256:514ceac913076feefbeaf89771fd6febde78b0c4c1b23aaeab082c41c694e81b", + "sha256:528a2a692c65dd5cafc130de286030af251d2ee0483a5bf50c9348aefe834e8a", + "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e", + "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa", + "sha256:718856856ba31f14f13ba885ff13874be7fefc53984d2832458f12c38205f7f7", + "sha256:7f7609a718b177bf171ac93cea9fd2ddc0e03e84d8fa4e887bdfc39671d46b00", + "sha256:80ca33961ced9c63358056bd08403ff866512038883e74f3a4bf88ad3eb66838", + "sha256:80fe64a6deb6fcfdf7b8386f2cf216d329be6f2781f7d90304351811fb591360", + "sha256:81c4b81611e3a3cb30e59b0cf05b888c675f97e3adb2c8672c3154047980726b", + "sha256:855c583f268edde09474b081e3ddcd5cf3b20c12f26e0d434e1386cc5d318e7a", + "sha256:9bfdb82cdfeccec50aad441afc332faf8606dfa5e8efd18a6692b5d6e79f00fd", + "sha256:a5d24e1d674dd9d72c66ad3ea9131322819ff86250b30dc5821cbafcfa0b96b4", + "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70", + "sha256:b5b3f092fe345c03bca1e0b687dfbb39364b21ebb8ba90e3fa707374b7915204", + "sha256:b9618823bd237c0d2575283f2939655f54d51b4527ec3972907a927acbcc5bfc", + "sha256:cef9c85ccbe9bee00909758936ea841ef12035296c748aaceee535969e27d31b", + "sha256:d21237d0cd37acded35154e29aec853e945950321dd2ffd1a7d86fe686814669", + "sha256:d3c5c79ab7dfce6d88f1ba639b77e77a17ea33a01b07b99840d6ed08031cb2a7", + "sha256:d9d7942b624b04b895cb95af03a23407f17646815495ce4547f0e60e0b06f58e", + "sha256:db6d9fac65bd08cea7f3540b899977c6dee9edad959fa4eaf305940d9cbd861c", + "sha256:ede5af4a2702444a832a800b8eb7f0a7a1c0eed55b644642e049c98d589e5092", + "sha256:effb7749713d5317478bb3acb3f81d9d7c7f86726d41c1facca068a04cf5bb4c", + "sha256:f154d173286a5d1863637a7dcd8c3437bb557520b01bddb0be0258dcb72696b5", + "sha256:f25ed6e28ddf50de7e7ea99d7a976d6a9c415f03adcaac9c41ff6ff41b6d86ac" + ], + "index": "pypi", + "version": "==9.0.1" + }, + "psycopg2-binary": { + "hashes": [ + "sha256:01310cf4cf26db9aea5158c217caa92d291f0500051a6469ac52166e1a16f5b7", + "sha256:083a55275f09a62b8ca4902dd11f4b33075b743cf0d360419e2051a8a5d5ff76", + "sha256:090f3348c0ab2cceb6dfbe6bf721ef61262ddf518cd6cc6ecc7d334996d64efa", + "sha256:0a29729145aaaf1ad8bafe663131890e2111f13416b60e460dae0a96af5905c9", + "sha256:0c9d5450c566c80c396b7402895c4369a410cab5a82707b11aee1e624da7d004", + "sha256:10bb90fb4d523a2aa67773d4ff2b833ec00857f5912bafcfd5f5414e45280fb1", + "sha256:12b11322ea00ad8db8c46f18b7dfc47ae215e4df55b46c67a94b4effbaec7094", + "sha256:152f09f57417b831418304c7f30d727dc83a12761627bb826951692cc6491e57", + "sha256:15803fa813ea05bef089fa78835118b5434204f3a17cb9f1e5dbfd0b9deea5af", + "sha256:15c4e4cfa45f5a60599d9cec5f46cd7b1b29d86a6390ec23e8eebaae84e64554", + "sha256:183a517a3a63503f70f808b58bfbf962f23d73b6dccddae5aa56152ef2bcb232", + "sha256:1f14c8b0942714eb3c74e1e71700cbbcb415acbc311c730370e70c578a44a25c", + "sha256:1f6b813106a3abdf7b03640d36e24669234120c72e91d5cbaeb87c5f7c36c65b", + "sha256:280b0bb5cbfe8039205c7981cceb006156a675362a00fe29b16fbc264e242834", + "sha256:2d872e3c9d5d075a2e104540965a1cf898b52274a5923936e5bfddb58c59c7c2", + "sha256:2f9ffd643bc7349eeb664eba8864d9e01f057880f510e4681ba40a6532f93c71", + "sha256:3303f8807f342641851578ee7ed1f3efc9802d00a6f83c101d21c608cb864460", + "sha256:35168209c9d51b145e459e05c31a9eaeffa9a6b0fd61689b48e07464ffd1a83e", + "sha256:3a79d622f5206d695d7824cbf609a4f5b88ea6d6dab5f7c147fc6d333a8787e4", + "sha256:404224e5fef3b193f892abdbf8961ce20e0b6642886cfe1fe1923f41aaa75c9d", + "sha256:46f0e0a6b5fa5851bbd9ab1bc805eef362d3a230fbdfbc209f4a236d0a7a990d", + "sha256:47133f3f872faf28c1e87d4357220e809dfd3fa7c64295a4a148bcd1e6e34ec9", + "sha256:526ea0378246d9b080148f2d6681229f4b5964543c170dd10bf4faaab6e0d27f", + "sha256:53293533fcbb94c202b7c800a12c873cfe24599656b341f56e71dd2b557be063", + "sha256:539b28661b71da7c0e428692438efbcd048ca21ea81af618d845e06ebfd29478", + "sha256:57804fc02ca3ce0dbfbef35c4b3a4a774da66d66ea20f4bda601294ad2ea6092", + "sha256:63638d875be8c2784cfc952c9ac34e2b50e43f9f0a0660b65e2a87d656b3116c", + "sha256:6472a178e291b59e7f16ab49ec8b4f3bdada0a879c68d3817ff0963e722a82ce", + "sha256:68641a34023d306be959101b345732360fc2ea4938982309b786f7be1b43a4a1", + "sha256:6e82d38390a03da28c7985b394ec3f56873174e2c88130e6966cb1c946508e65", + "sha256:761df5313dc15da1502b21453642d7599d26be88bff659382f8f9747c7ebea4e", + "sha256:7af0dd86ddb2f8af5da57a976d27cd2cd15510518d582b478fbb2292428710b4", + "sha256:7b1e9b80afca7b7a386ef087db614faebbf8839b7f4db5eb107d0f1a53225029", + "sha256:874a52ecab70af13e899f7847b3e074eeb16ebac5615665db33bce8a1009cf33", + "sha256:887dd9aac71765ac0d0bac1d0d4b4f2c99d5f5c1382d8b770404f0f3d0ce8a39", + "sha256:8b344adbb9a862de0c635f4f0425b7958bf5a4b927c8594e6e8d261775796d53", + "sha256:8fc53f9af09426a61db9ba357865c77f26076d48669f2e1bb24d85a22fb52307", + "sha256:91920527dea30175cc02a1099f331aa8c1ba39bf8b7762b7b56cbf54bc5cce42", + "sha256:93cd1967a18aa0edd4b95b1dfd554cf15af657cb606280996d393dadc88c3c35", + "sha256:99485cab9ba0fa9b84f1f9e1fef106f44a46ef6afdeec8885e0b88d0772b49e8", + "sha256:9d29409b625a143649d03d0fd7b57e4b92e0ecad9726ba682244b73be91d2fdb", + "sha256:a29b3ca4ec9defec6d42bf5feb36bb5817ba3c0230dd83b4edf4bf02684cd0ae", + "sha256:a9e1f75f96ea388fbcef36c70640c4efbe4650658f3d6a2967b4cc70e907352e", + "sha256:accfe7e982411da3178ec690baaceaad3c278652998b2c45828aaac66cd8285f", + "sha256:adf20d9a67e0b6393eac162eb81fb10bc9130a80540f4df7e7355c2dd4af9fba", + "sha256:af9813db73395fb1fc211bac696faea4ca9ef53f32dc0cfa27e4e7cf766dcf24", + "sha256:b1c8068513f5b158cf7e29c43a77eb34b407db29aca749d3eb9293ee0d3103ca", + "sha256:bda845b664bb6c91446ca9609fc69f7db6c334ec5e4adc87571c34e4f47b7ddb", + "sha256:c381bda330ddf2fccbafab789d83ebc6c53db126e4383e73794c74eedce855ef", + "sha256:c3ae8e75eb7160851e59adc77b3a19a976e50622e44fd4fd47b8b18208189d42", + "sha256:d1c1b569ecafe3a69380a94e6ae09a4789bbb23666f3d3a08d06bbd2451f5ef1", + "sha256:def68d7c21984b0f8218e8a15d514f714d96904265164f75f8d3a70f9c295667", + "sha256:dffc08ca91c9ac09008870c9eb77b00a46b3378719584059c034b8945e26b272", + "sha256:e3699852e22aa68c10de06524a3721ade969abf382da95884e6a10ff798f9281", + "sha256:e847774f8ffd5b398a75bc1c18fbb56564cda3d629fe68fd81971fece2d3c67e", + "sha256:ffb7a888a047696e7f8240d649b43fb3644f14f0ee229077e7f6b9f9081635bd" + ], + "index": "pypi", + "version": "==2.9.3" + }, + "pyee": { + "hashes": [ + "sha256:2770c4928abc721f46b705e6a72b0c59480c4a69c9a83ca0b00bb994f1ea4b32", + "sha256:9f066570130c554e9cc12de5a9d86f57c7ee47fece163bbdaa3e9c933cfbdfa5" + ], + "version": "==9.0.4" + }, + "pyperclip": { + "hashes": [ + "sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57" + ], + "index": "pypi", + "version": "==1.8.2" + }, + "python-dotenv": { + "hashes": [ + "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3", + "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f" + ], + "index": "pypi", + "version": "==0.19.2" + }, + "requests": { + "hashes": [ + "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", + "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + ], + "index": "pypi", + "version": "==2.27.1" + }, + "slackclient": { + "hashes": [ + "sha256:07ec8fa76f6aa64852210ae235ff9e637ba78124e06c0b07a7eeea4abb955965", + "sha256:2d68d668c02f4038299897e5c4723ab85dd40a3548354924b24f333a435856f8" + ], + "index": "pypi", + "version": "==2.9.3" + }, + "slackeventsapi": { + "hashes": [ + "sha256:24f8e843a60118b08368161105bae8a998801202f85782239d48f8635e2ead58", + "sha256:b3b075917743a83288cb92a7cbde35f181cdecddc4392b9ab1c9ed9f001ffe2c" + ], + "index": "pypi", + "version": "==3.0.1" + }, + "smmap": { + "hashes": [ + "sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94", + "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936" + ], + "markers": "python_version >= '3.6'", + "version": "==5.0.0" + }, + "sudden-death": { + "git": "https://github.com/dev-hato/sudden-death", + "ref": "2a79e16673e8bea0d20347c7fe5818bed8d93815" + }, + "typing-extensions": { + "hashes": [ + "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e", + "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b" + ], + "markers": "python_version >= '3.6'", + "version": "==4.0.1" + }, + "urllib3": { + "hashes": [ + "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed", + "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.8" + }, + "werkzeug": { + "hashes": [ + "sha256:1421ebfc7648a39a5c58c601b154165d05cf47a3cd0ccb70857cbdacf6c8f2b8", + "sha256:b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c" + ], + "markers": "python_version >= '3.6'", + "version": "==2.0.3" + }, + "yarl": { + "hashes": [ + "sha256:044daf3012e43d4b3538562da94a88fb12a6490652dbc29fb19adfa02cf72eac", + "sha256:0cba38120db72123db7c58322fa69e3c0efa933040ffb586c3a87c063ec7cae8", + "sha256:167ab7f64e409e9bdd99333fe8c67b5574a1f0495dcfd905bc7454e766729b9e", + "sha256:1be4bbb3d27a4e9aa5f3df2ab61e3701ce8fcbd3e9846dbce7c033a7e8136746", + "sha256:1ca56f002eaf7998b5fcf73b2421790da9d2586331805f38acd9997743114e98", + "sha256:1d3d5ad8ea96bd6d643d80c7b8d5977b4e2fb1bab6c9da7322616fd26203d125", + "sha256:1eb6480ef366d75b54c68164094a6a560c247370a68c02dddb11f20c4c6d3c9d", + "sha256:1edc172dcca3f11b38a9d5c7505c83c1913c0addc99cd28e993efeaafdfaa18d", + "sha256:211fcd65c58bf250fb994b53bc45a442ddc9f441f6fec53e65de8cba48ded986", + "sha256:29e0656d5497733dcddc21797da5a2ab990c0cb9719f1f969e58a4abac66234d", + "sha256:368bcf400247318382cc150aaa632582d0780b28ee6053cd80268c7e72796dec", + "sha256:39d5493c5ecd75c8093fa7700a2fb5c94fe28c839c8e40144b7ab7ccba6938c8", + "sha256:3abddf0b8e41445426d29f955b24aeecc83fa1072be1be4e0d194134a7d9baee", + "sha256:3bf8cfe8856708ede6a73907bf0501f2dc4e104085e070a41f5d88e7faf237f3", + "sha256:3ec1d9a0d7780416e657f1e405ba35ec1ba453a4f1511eb8b9fbab81cb8b3ce1", + "sha256:45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd", + "sha256:52690eb521d690ab041c3919666bea13ab9fbff80d615ec16fa81a297131276b", + "sha256:534b047277a9a19d858cde163aba93f3e1677d5acd92f7d10ace419d478540de", + "sha256:580c1f15500e137a8c37053e4cbf6058944d4c114701fa59944607505c2fe3a0", + "sha256:59218fef177296451b23214c91ea3aba7858b4ae3306dde120224cfe0f7a6ee8", + "sha256:5ba63585a89c9885f18331a55d25fe81dc2d82b71311ff8bd378fc8004202ff6", + "sha256:5bb7d54b8f61ba6eee541fba4b83d22b8a046b4ef4d8eb7f15a7e35db2e1e245", + "sha256:6152224d0a1eb254f97df3997d79dadd8bb2c1a02ef283dbb34b97d4f8492d23", + "sha256:67e94028817defe5e705079b10a8438b8cb56e7115fa01640e9c0bb3edf67332", + "sha256:695ba021a9e04418507fa930d5f0704edbce47076bdcfeeaba1c83683e5649d1", + "sha256:6a1a9fe17621af43e9b9fcea8bd088ba682c8192d744b386ee3c47b56eaabb2c", + "sha256:6ab0c3274d0a846840bf6c27d2c60ba771a12e4d7586bf550eefc2df0b56b3b4", + "sha256:6feca8b6bfb9eef6ee057628e71e1734caf520a907b6ec0d62839e8293e945c0", + "sha256:737e401cd0c493f7e3dd4db72aca11cfe069531c9761b8ea474926936b3c57c8", + "sha256:788713c2896f426a4e166b11f4ec538b5736294ebf7d5f654ae445fd44270832", + "sha256:797c2c412b04403d2da075fb93c123df35239cd7b4cc4e0cd9e5839b73f52c58", + "sha256:8300401dc88cad23f5b4e4c1226f44a5aa696436a4026e456fe0e5d2f7f486e6", + "sha256:87f6e082bce21464857ba58b569370e7b547d239ca22248be68ea5d6b51464a1", + "sha256:89ccbf58e6a0ab89d487c92a490cb5660d06c3a47ca08872859672f9c511fc52", + "sha256:8b0915ee85150963a9504c10de4e4729ae700af11df0dc5550e6587ed7891e92", + "sha256:8cce6f9fa3df25f55521fbb5c7e4a736683148bcc0c75b21863789e5185f9185", + "sha256:95a1873b6c0dd1c437fb3bb4a4aaa699a48c218ac7ca1e74b0bee0ab16c7d60d", + "sha256:9b4c77d92d56a4c5027572752aa35082e40c561eec776048330d2907aead891d", + "sha256:9bfcd43c65fbb339dc7086b5315750efa42a34eefad0256ba114cd8ad3896f4b", + "sha256:9c1f083e7e71b2dd01f7cd7434a5f88c15213194df38bc29b388ccdf1492b739", + "sha256:a1d0894f238763717bdcfea74558c94e3bc34aeacd3351d769460c1a586a8b05", + "sha256:a467a431a0817a292121c13cbe637348b546e6ef47ca14a790aa2fa8cc93df63", + "sha256:aa32aaa97d8b2ed4e54dc65d241a0da1c627454950f7d7b1f95b13985afd6c5d", + "sha256:ac10bbac36cd89eac19f4e51c032ba6b412b3892b685076f4acd2de18ca990aa", + "sha256:ac35ccde589ab6a1870a484ed136d49a26bcd06b6a1c6397b1967ca13ceb3913", + "sha256:bab827163113177aee910adb1f48ff7af31ee0289f434f7e22d10baf624a6dfe", + "sha256:baf81561f2972fb895e7844882898bda1eef4b07b5b385bcd308d2098f1a767b", + "sha256:bf19725fec28452474d9887a128e98dd67eee7b7d52e932e6949c532d820dc3b", + "sha256:c01a89a44bb672c38f42b49cdb0ad667b116d731b3f4c896f72302ff77d71656", + "sha256:c0910c6b6c31359d2f6184828888c983d54d09d581a4a23547a35f1d0b9484b1", + "sha256:c10ea1e80a697cf7d80d1ed414b5cb8f1eec07d618f54637067ae3c0334133c4", + "sha256:c1164a2eac148d85bbdd23e07dfcc930f2e633220f3eb3c3e2a25f6148c2819e", + "sha256:c145ab54702334c42237a6c6c4cc08703b6aa9b94e2f227ceb3d477d20c36c63", + "sha256:c17965ff3706beedafd458c452bf15bac693ecd146a60a06a214614dc097a271", + "sha256:c19324a1c5399b602f3b6e7db9478e5b1adf5cf58901996fc973fe4fccd73eed", + "sha256:c2a1ac41a6aa980db03d098a5531f13985edcb451bcd9d00670b03129922cd0d", + "sha256:c6ddcd80d79c96eb19c354d9dca95291589c5954099836b7c8d29278a7ec0bda", + "sha256:c9c6d927e098c2d360695f2e9d38870b2e92e0919be07dbe339aefa32a090265", + "sha256:cc8b7a7254c0fc3187d43d6cb54b5032d2365efd1df0cd1749c0c4df5f0ad45f", + "sha256:cff3ba513db55cc6a35076f32c4cdc27032bd075c9faef31fec749e64b45d26c", + "sha256:d260d4dc495c05d6600264a197d9d6f7fc9347f21d2594926202fd08cf89a8ba", + "sha256:d6f3d62e16c10e88d2168ba2d065aa374e3c538998ed04996cd373ff2036d64c", + "sha256:da6df107b9ccfe52d3a48165e48d72db0eca3e3029b5b8cb4fe6ee3cb870ba8b", + "sha256:dfe4b95b7e00c6635a72e2d00b478e8a28bfb122dc76349a06e20792eb53a523", + "sha256:e39378894ee6ae9f555ae2de332d513a5763276a9265f8e7cbaeb1b1ee74623a", + "sha256:ede3b46cdb719c794427dcce9d8beb4abe8b9aa1e97526cc20de9bd6583ad1ef", + "sha256:f2a8508f7350512434e41065684076f640ecce176d262a7d54f0da41d99c5a95", + "sha256:f44477ae29025d8ea87ec308539f95963ffdc31a82f42ca9deecf2d505242e72", + "sha256:f64394bd7ceef1237cc604b5a89bf748c95982a84bcd3c4bbeb40f685c810794", + "sha256:fc4dd8b01a8112809e6b636b00f487846956402834a7fd59d46d4f4267181c41", + "sha256:fce78593346c014d0d986b7ebc80d782b7f5e19843ca798ed62f8e3ba8728576", + "sha256:fd547ec596d90c8676e369dd8a581a21227fe9b4ad37d0dc7feb4ccf544c2d59" + ], + "markers": "python_version >= '3.6'", + "version": "==1.7.2" + } + }, + "develop": { + "autopep8": { + "hashes": [ + "sha256:44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979", + "sha256:ed77137193bbac52d029a52c59bec1b0629b5a186c495f1eb21b126ac466083f" + ], + "index": "pypi", + "version": "==1.6.0" + }, + "certifi": { + "hashes": [ + "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", + "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" + ], + "version": "==2021.10.8" + }, + "charset-normalizer": { + "hashes": [ + "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45", + "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c" + ], + "markers": "python_version >= '3'", + "version": "==2.0.11" + }, + "idna": { + "hashes": [ + "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", + "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" + ], + "markers": "python_version >= '3'", + "version": "==3.3" + }, + "pycodestyle": { + "hashes": [ + "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20", + "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.8.0" + }, + "requests": { + "hashes": [ + "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", + "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + ], + "index": "pypi", + "version": "==2.27.1" + }, + "requests-mock": { + "hashes": [ + "sha256:0a2d38a117c08bb78939ec163522976ad59a6b7fdd82b709e23bb98004a44970", + "sha256:8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba" + ], + "index": "pypi", + "version": "==1.9.3" + }, + "six": { + "hashes": [ + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.16.0" + }, + "toml": { + "hashes": [ + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.2" + }, + "urllib3": { + "hashes": [ + "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed", + "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.8" + } + } +} From 1cd8dbf5d7e01223e5fab4d0edfd58f6f0d02a81 Mon Sep 17 00:00:00 2001 From: bgpat Date: Fri, 11 Feb 2022 22:47:35 +0900 Subject: [PATCH 03/57] Comment out custom PYTHONPATH --- .github/workflows/pr-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index e74a6ed745..cd51e0dc72 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -315,11 +315,11 @@ jobs: - name: Install dependencies run: | yarn install -D - - run: | - PYTHONPATH="/github/workspace/" - PYTHONPATH+=":/github/workflow/.venv/lib/" - PYTHONPATH+="python${{ matrix.python-version }}/site-packages" - echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" +# - run: | +# PYTHONPATH="/github/workspace/" +# PYTHONPATH+=":/github/workflow/.venv/lib/" +# PYTHONPATH+="python${{ matrix.python-version }}/site-packages" +# echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - name: Lint files uses: github/super-linter@v4.8.7 env: @@ -329,5 +329,5 @@ jobs: VALIDATE_PYTHON_ISORT: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} WORKON_HOME: "" - PYTHONPATH: ${{ env.PYTHONPATH }} +# PYTHONPATH: ${{ env.PYTHONPATH }} PATH: /github/workspace/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/node_modules/.bin:/venvs/ansible-lint/bin:/venvs/black/bin:/venvs/cfn-lint/bin:/venvs/cpplint/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/mypy/bin:/venvs/pylint/bin:/venvs/snakefmt/bin:/venvs/snakemake/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin:/venvs/yq/bin:/var/cache/dotnet/tools:/usr/share/dotnet From 544a4ea3f0cf077a3f10e6761cf1dc390b135345 Mon Sep 17 00:00:00 2001 From: fono09 Date: Fri, 11 Feb 2022 22:47:52 +0900 Subject: [PATCH 04/57] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E5=B7=AE?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index e74a6ed745..464845a5cc 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -317,9 +317,12 @@ jobs: yarn install -D - run: | PYTHONPATH="/github/workspace/" - PYTHONPATH+=":/github/workflow/.venv/lib/" - PYTHONPATH+="python${{ matrix.python-version }}/site-packages" + PYTHONPATH+=":${venv_path}/site-packages" echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" + - run: | + ls -al ${{venv_path}} + echo "${PYTHONPATH}" + echo "${venv_path}" - name: Lint files uses: github/super-linter@v4.8.7 env: From c3bc9c3b8d9b61aedb8e1e8f7310286bcc99f13d Mon Sep 17 00:00:00 2001 From: bgpat Date: Fri, 11 Feb 2022 22:53:21 +0900 Subject: [PATCH 05/57] Debug PYTHONPAYH --- .github/workflows/pr-test.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index cd51e0dc72..0deca5064b 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -275,6 +275,7 @@ jobs: - name: Install dependencies run: | pipenv install --dev + echo $PYTHONPATH # pipenvの仕様で、project直下の.venvの場合は .venv/lib/... にインストールされるが、 # WORKON_HOMEを設定してインストール先をずらした場合は @@ -315,11 +316,11 @@ jobs: - name: Install dependencies run: | yarn install -D -# - run: | -# PYTHONPATH="/github/workspace/" -# PYTHONPATH+=":/github/workflow/.venv/lib/" -# PYTHONPATH+="python${{ matrix.python-version }}/site-packages" -# echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" + - run: | + PYTHONPATH="/github/workspace/" + PYTHONPATH+=":/github/workflow/.venv/lib/" + PYTHONPATH+="python3.9/site-packages" + echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - name: Lint files uses: github/super-linter@v4.8.7 env: @@ -329,5 +330,5 @@ jobs: VALIDATE_PYTHON_ISORT: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} WORKON_HOME: "" -# PYTHONPATH: ${{ env.PYTHONPATH }} + PYTHONPATH: ${{ env.PYTHONPATH }} PATH: /github/workspace/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/node_modules/.bin:/venvs/ansible-lint/bin:/venvs/black/bin:/venvs/cfn-lint/bin:/venvs/cpplint/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/mypy/bin:/venvs/pylint/bin:/venvs/snakefmt/bin:/venvs/snakemake/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin:/venvs/yq/bin:/var/cache/dotnet/tools:/usr/share/dotnet From 4b04ad58ed1f48f8745cfbe9596f5fe108483ff2 Mon Sep 17 00:00:00 2001 From: bgpat Date: Fri, 11 Feb 2022 23:39:20 +0900 Subject: [PATCH 06/57] Fix PYTHONPATH --- .github/workflows/pr-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 0deca5064b..526c89b8b8 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -275,7 +275,6 @@ jobs: - name: Install dependencies run: | pipenv install --dev - echo $PYTHONPATH # pipenvの仕様で、project直下の.venvの場合は .venv/lib/... にインストールされるが、 # WORKON_HOMEを設定してインストール先をずらした場合は @@ -318,8 +317,9 @@ jobs: yarn install -D - run: | PYTHONPATH="/github/workspace/" - PYTHONPATH+=":/github/workflow/.venv/lib/" - PYTHONPATH+="python3.9/site-packages" + for dir in $(ls ${venv_path}/lib); do + PYTHONPATH+=":/github/workflow/.venv/lib/${dir}/site-packages" + done echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - name: Lint files uses: github/super-linter@v4.8.7 From aaac161a3ea539d59395afa6c17796ce2ae36cee Mon Sep 17 00:00:00 2001 From: bgpat Date: Fri, 11 Feb 2022 23:41:12 +0900 Subject: [PATCH 07/57] Fix yaml --- .github/workflows/pr-test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 07e45b73f2..526c89b8b8 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -321,10 +321,6 @@ jobs: PYTHONPATH+=":/github/workflow/.venv/lib/${dir}/site-packages" done echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - - run: | - ls -al ${{venv_path}} - echo "${PYTHONPATH}" - echo "${venv_path}" - name: Lint files uses: github/super-linter@v4.8.7 env: From 18dea3f6ecd7fe09b7d53f83554f3c82c770f3be Mon Sep 17 00:00:00 2001 From: bgpat Date: Fri, 11 Feb 2022 23:58:47 +0900 Subject: [PATCH 08/57] Fix lint --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 526c89b8b8..74b2ad6874 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -317,7 +317,7 @@ jobs: yarn install -D - run: | PYTHONPATH="/github/workspace/" - for dir in $(ls ${venv_path}/lib); do + for dir in ${venv_path}/lib/*; do PYTHONPATH+=":/github/workflow/.venv/lib/${dir}/site-packages" done echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" From 5e310ae3e495b619b1b12d852d66cd5ab87a43d0 Mon Sep 17 00:00:00 2001 From: bgpat Date: Sat, 12 Feb 2022 00:05:44 +0900 Subject: [PATCH 09/57] Fix SC2231 --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 74b2ad6874..5d09ef719d 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -317,7 +317,7 @@ jobs: yarn install -D - run: | PYTHONPATH="/github/workspace/" - for dir in ${venv_path}/lib/*; do + for dir in "${venv_path}/lib"/*; do PYTHONPATH+=":/github/workflow/.venv/lib/${dir}/site-packages" done echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" From 625da1de711a6c39361ededa74feedca14965a16 Mon Sep 17 00:00:00 2001 From: fono09 Date: Sat, 12 Feb 2022 00:31:59 +0900 Subject: [PATCH 10/57] =?UTF-8?q?=E7=A9=BA=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 5e8772e6e490c6ff693e87dd22fb3865a3f53b7d Mon Sep 17 00:00:00 2001 From: bgpat Date: Sat, 12 Feb 2022 00:27:46 +0900 Subject: [PATCH 11/57] Strip patch version --- .github/workflows/pr-test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 5d09ef719d..cdfd18ebac 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -316,11 +316,7 @@ jobs: run: | yarn install -D - run: | - PYTHONPATH="/github/workspace/" - for dir in "${venv_path}/lib"/*; do - PYTHONPATH+=":/github/workflow/.venv/lib/${dir}/site-packages" - done - echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" + jq -nr --arg version ${{ matrix.python-version }} '"PYTHONPATH=/github/workspace/:/github/workflow/.venv/lib/python\($version|split(".")[0:2]|join("."))/site-packages"' >> "${GITHUB_ENV}" - name: Lint files uses: github/super-linter@v4.8.7 env: From c5166e62ea033eb95de7a997db024d5270cea46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=89=E3=81=AE=28=E3=82=84=E3=82=8F=E3=82=81?= =?UTF-8?q?=29?= Date: Sat, 12 Feb 2022 00:39:01 +0900 Subject: [PATCH 12/57] Update .github/workflows/pr-test.yml Co-authored-by: Atsushi Tanaka --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 464845a5cc..421e6344a4 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -320,7 +320,7 @@ jobs: PYTHONPATH+=":${venv_path}/site-packages" echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - run: | - ls -al ${{venv_path}} + ls -al ${venv_path} echo "${PYTHONPATH}" echo "${venv_path}" - name: Lint files From 4b2ecd3ba274e58eea7a242e6f2973057385673c Mon Sep 17 00:00:00 2001 From: fono09 Date: Sat, 12 Feb 2022 00:47:17 +0900 Subject: [PATCH 13/57] =?UTF-8?q?hato-bot=E3=81=AEPipfile=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=81=AEvenv=E9=85=8D=E4=B8=8B=E3=82=92=E5=86=8D?= =?UTF-8?q?=E5=B8=B0=E7=9A=84=E3=81=AB=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 421e6344a4..2c12f54608 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -320,7 +320,7 @@ jobs: PYTHONPATH+=":${venv_path}/site-packages" echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - run: | - ls -al ${venv_path} + ls -R ${venv_path} echo "${PYTHONPATH}" echo "${venv_path}" - name: Lint files From ffeec76af5bae98147f5095364e1abf0dbcd36c4 Mon Sep 17 00:00:00 2001 From: fono09 Date: Sat, 12 Feb 2022 01:04:46 +0900 Subject: [PATCH 14/57] pyvenv.cfg --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 2c12f54608..3677eb44df 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -320,7 +320,7 @@ jobs: PYTHONPATH+=":${venv_path}/site-packages" echo "PYTHONPATH=${PYTHONPATH}" >> "${GITHUB_ENV}" - run: | - ls -R ${venv_path} + cat ${venv_path}/pyvenv.cfg echo "${PYTHONPATH}" echo "${venv_path}" - name: Lint files From 56aef431ce0d98b0c0bd09adccbde0deddfb736d Mon Sep 17 00:00:00 2001 From: fono09 Date: Sat, 12 Feb 2022 01:25:47 +0900 Subject: [PATCH 15/57] =?UTF-8?q?Python=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AFPython=E3=81=AB=E8=81=9E?= =?UTF-8?q?=E3=81=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index cdfd18ebac..ab530f16f1 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -316,7 +316,7 @@ jobs: run: | yarn install -D - run: | - jq -nr --arg version ${{ matrix.python-version }} '"PYTHONPATH=/github/workspace/:/github/workflow/.venv/lib/python\($version|split(".")[0:2]|join("."))/site-packages"' >> "${GITHUB_ENV}" + echo "PYTHONPATH=/github/workpace/:/github/workflow/.venv/lib/python$(echo 'import sys; print(".".join(map(str, sys.version_info[0:2])))' | python)/site-packages" >> "${GITHUB_ENV}" - name: Lint files uses: github/super-linter@v4.8.7 env: From 06ca436cd348ae5cb7f76bf7773ab55cedb901f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 22:03:24 +0000 Subject: [PATCH 16/57] Bump actions/github-script from 5 to 6 Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-check-yarn.yml | 8 ++++---- .github/workflows/pr-merge-develop-hato-bot.yml | 4 ++-- .github/workflows/pr-release-hato-bot.yml | 4 ++-- .github/workflows/pr-test.yml | 8 ++++---- .../workflows/pr-update-pre-commit-config-hato-bot.yml | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pr-check-yarn.yml b/.github/workflows/pr-check-yarn.yml index d0f66a90e1..8dc6c85602 100644 --- a/.github/workflows/pr-check-yarn.yml +++ b/.github/workflows/pr-check-yarn.yml @@ -55,7 +55,7 @@ jobs: GITHUB_HEAD="HEAD:refs/heads/yarn-${HEAD_REF}" git push -f "${REPO_URL}" "${GITHUB_HEAD}" - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -80,7 +80,7 @@ jobs: return pulls.length # pushしたブランチでPRを作る - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -110,7 +110,7 @@ jobs: ) return create_pull_res.data.number - name: Assign a user - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ env.REPO_NAME == github.repository && steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 @@ -130,7 +130,7 @@ jobs: # 既にpackage.json, yarn.lock修正のPRがある状態で、 # 手動でpackage.json, yarn.lockを修正した場合、修正のPRを閉じる - name: Close PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository diff --git a/.github/workflows/pr-merge-develop-hato-bot.yml b/.github/workflows/pr-merge-develop-hato-bot.yml index 48be0a82c2..cb08517c9f 100644 --- a/.github/workflows/pr-merge-develop-hato-bot.yml +++ b/.github/workflows/pr-merge-develop-hato-bot.yml @@ -20,7 +20,7 @@ jobs: with: fetch-depth: 0 - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 id: get_pull_requests with: github-token: ${{secrets.GITHUB_TOKEN}} @@ -37,7 +37,7 @@ jobs: pulls_list_params) return pulls.length - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ steps.get_pull_requests.outputs.result == 0 }} with: github-token: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/pr-release-hato-bot.yml b/.github/workflows/pr-release-hato-bot.yml index 5ba5a4eae3..3b4f7b137b 100644 --- a/.github/workflows/pr-release-hato-bot.yml +++ b/.github/workflows/pr-release-hato-bot.yml @@ -27,7 +27,7 @@ jobs: result="${result//$'\r'/'%0D'}" echo "::set-output name=result::${result}" - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ steps.get_diff.outputs.result != '' }} id: get_pull_requests with: @@ -45,7 +45,7 @@ jobs: pulls_list_params) return pulls.length - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ steps.get_diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 }} with: diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 5cd0ab0e75..9c9d08ebeb 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -110,7 +110,7 @@ jobs: GITHUB_HEAD="HEAD:refs/heads/fix-format-${HEAD_REF}" git push -f "${REPO_URL}" "${GITHUB_HEAD}" - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -134,7 +134,7 @@ jobs: return pulls.length # pushしたブランチでPRを作る - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -163,7 +163,7 @@ jobs: ) return create_pull_res.data.number - name: Assign a user - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ env.REPO_NAME == github.repository && (steps.install_pipenv.outcome == 'failure' || steps.format.outcome == 'failure') @@ -183,7 +183,7 @@ jobs: await github.rest.issues.addAssignees(issues_add_assignees_params) # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる - name: Close PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository diff --git a/.github/workflows/pr-update-pre-commit-config-hato-bot.yml b/.github/workflows/pr-update-pre-commit-config-hato-bot.yml index ef1f955d7c..0b3717d663 100644 --- a/.github/workflows/pr-update-pre-commit-config-hato-bot.yml +++ b/.github/workflows/pr-update-pre-commit-config-hato-bot.yml @@ -15,7 +15,7 @@ jobs: - name: Install packages run: yarn add js-yaml - name: Update .pre-commit-config.yaml - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | @@ -77,7 +77,7 @@ jobs: GITHUB_HEAD="HEAD:refs/heads/fix-version-pre-commit-config-${HEAD_REF}" git push -f "${REPO_URL}" "${GITHUB_HEAD}" - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -100,7 +100,7 @@ jobs: return pulls.length # pushしたブランチでPRを作る - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -128,7 +128,7 @@ jobs: ) return create_pull_res.data.number - name: Assign a user - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ env.REPO_NAME == github.repository && steps.diff.outputs.result != '' && steps.get_pull_requests.outputs.result == 0 @@ -147,7 +147,7 @@ jobs: await github.rest.issues.addAssignees(issues_add_assignees_params) # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる - name: Close PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository From e02bbfdefa66549d68d7192af8291d746ce662dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=89=E3=81=AE=28=E3=82=84=E3=82=8F=E3=82=81?= =?UTF-8?q?=29?= Date: Sat, 12 Feb 2022 08:50:03 +0900 Subject: [PATCH 17/57] Apply suggestions from code review --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index f10abf043b..44cd7b7eda 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -316,7 +316,7 @@ jobs: run: | yarn install -D - run: | - echo "PYTHONPATH=/github/workpace/:/github/workflow/.venv/lib/python$(echo 'import sys; print(".".join(map(str, sys.version_info[0:2])))' | python)/site-packages" >> "${GITHUB_ENV}" + 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}" - name: Lint files uses: github/super-linter@v4.8.7 env: From 8dc2ca2000c06340efca4dbf5ee868e48e8c8b15 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 09:16:14 +0900 Subject: [PATCH 18/57] =?UTF-8?q?matrix=E3=82=92=E4=BD=BF=E3=82=8F?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=83=BBcache=E3=82=92actions/setup-node?= =?UTF-8?q?=E3=81=AB=E5=AF=84=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-check-yarn.yml | 9 ++-- .../workflows/pr-merge-develop-hato-bot.yml | 3 -- .github/workflows/pr-release-hato-bot.yml | 3 -- .github/workflows/pr-test-hato-bot.yml | 22 ++------ .github/workflows/pr-test.yml | 51 ++++--------------- 5 files changed, 18 insertions(+), 70 deletions(-) diff --git a/.github/workflows/pr-check-yarn.yml b/.github/workflows/pr-check-yarn.yml index 8dc6c85602..85854d0b8a 100644 --- a/.github/workflows/pr-check-yarn.yml +++ b/.github/workflows/pr-check-yarn.yml @@ -8,10 +8,6 @@ jobs: # package.jsonかyarn.lockに差分があれば、package.jsonからyarn.lockを作り出す pr-check-yarn: runs-on: ubuntu-latest - strategy: - matrix: - node-version: [16.x] - fail-fast: false steps: - uses: actions/checkout@v2 @@ -20,10 +16,11 @@ jobs: # submodule: 'recursive' fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - - name: Set up Node.js ${{ matrix.node-version }} + - run: echo "NODE_VERSION=16.x" >> "${GITHUB_ENV}" + - name: Set up Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v2.5.1 with: - node-version: ${{ matrix.node-version }} + node-version: ${{ env.NODE_VERSION }} cache: yarn - name: Install dependencies run: | diff --git a/.github/workflows/pr-merge-develop-hato-bot.yml b/.github/workflows/pr-merge-develop-hato-bot.yml index f8630fd97e..3b75650280 100644 --- a/.github/workflows/pr-merge-develop-hato-bot.yml +++ b/.github/workflows/pr-merge-develop-hato-bot.yml @@ -11,9 +11,6 @@ jobs: # masterとdevelopの間でコミットログに差異が出ないようにする pr-master-to-develop: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9.10] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-release-hato-bot.yml b/.github/workflows/pr-release-hato-bot.yml index 9cbbead1f3..aaa2f79c71 100644 --- a/.github/workflows/pr-release-hato-bot.yml +++ b/.github/workflows/pr-release-hato-bot.yml @@ -10,9 +10,6 @@ jobs: # リリース用のPRを作成するjob pr-release: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9.10] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index f3a210a0e2..ac871f27e4 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -13,31 +13,17 @@ jobs: # testが落ちたらチェックが落ちる pr-test: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9.10] steps: - uses: actions/checkout@v2 with: submodules: "recursive" - - name: Set up Python ${{ matrix.python-version }} + - run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}" + - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v2.3.2 with: - python-version: ${{ matrix.python-version }} - - run: | - KEY="${{ hashFiles('./.github/workflows/pr-test-hato-bot.yml') }}" - KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" - KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv-v2" - echo "KEY=${KEY}" >> "${GITHUB_ENV}" - - name: pipenv cache - uses: actions/cache@v2.1.7 - with: - key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - path: ${{ env.WORKON_HOME }} - restore-keys: | - ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - ${{ env.KEY }}- + python-version: ${{ env.PYTHON_VERSION }} + cache: pipenv - name: Install pipenv run: | file_name=Dockerfile diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 44cd7b7eda..a59b67f2aa 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -12,9 +12,6 @@ jobs: # PRが来たらformatをかけてみて、差分があればPRを作って、エラーで落ちるjob pr-format: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9.10] steps: - uses: actions/checkout@v2 @@ -23,23 +20,12 @@ jobs: # submodule: 'recursive' fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - - name: Set up Python ${{ matrix.python-version }} + - run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}" + - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v2.3.2 with: - python-version: ${{ matrix.python-version }} - - run: | - KEY="${{ hashFiles('./.github/workflows/pr-test.yml') }}" - KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" - KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv" - echo "KEY=${KEY}" >> "${GITHUB_ENV}" - - name: pipenv cache - uses: actions/cache@v2.1.7 - with: - key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - path: ${{ env.WORKON_HOME }} - restore-keys: | - ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - ${{ env.KEY }}- + python-version: ${{env.PYTHON_VERSION }} + cache: pipenv - name: Install pipenv id: install_pipenv continue-on-error: true @@ -230,33 +216,18 @@ jobs: pr-super-lint: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9.10] - node-version: [16.x] steps: - uses: actions/checkout@v2 with: submodules: "recursive" fetch-depth: 0 - - name: Set up Python ${{ matrix.python-version }} + - run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}" + - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v2.3.2 with: - python-version: ${{ matrix.python-version }} - - run: | - KEY="${{ hashFiles('./.github/workflows/pr-test.yml') }}" - KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" - KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv" - echo "KEY=${KEY}" >> "${GITHUB_ENV}" - - name: pipenv cache - uses: actions/cache@v2.1.7 - with: - key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - path: ${{ env.WORKON_HOME }} - restore-keys: | - ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - ${{ env.KEY }}- + python-version: ${{ env.PYTHON_VERSION }} + cache: pipenv - name: Install pipenv run: | file_name=Dockerfile @@ -306,11 +277,11 @@ jobs: run: | DEST_PATH="/home/runner/work/_temp/_github_workflow/.venv" cp -r ${{ env.venv_path }} "${DEST_PATH}" - - - name: Set up Node.js ${{ matrix.node-version }} + - run: echo "NODE_VERSION=16.x" >> "${GITHUB_ENV}" + - name: Set up Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v2.5.1 with: - node-version: ${{ matrix.node-version }} + node-version: ${{ env.NODE_VERSION }} cache: yarn - name: Install dependencies run: | From b47fe89a7f947ac415e35ae5aec38af98144406b Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 09:21:44 +0900 Subject: [PATCH 19/57] =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=86=E3=83=8A?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=92=E5=89=8A=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 0a590336d5..bd28b9c5c2 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.10 +3.9 From ab1ef9dafc04bc563e29ac2ef7724dc2e52a886d Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 09:30:42 +0900 Subject: [PATCH 20/57] =?UTF-8?q?WORKON=5FHOME=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test-hato-bot.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index ac871f27e4..f5790240da 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -5,9 +5,6 @@ name: pr-test-hato-bot on: pull_request: -env: - WORKON_HOME: /tmp/.venv - jobs: # unittestを行う # testが落ちたらチェックが落ちる From 3498b5d3c807f4929015c62c099379f38077bfc0 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 09:43:55 +0900 Subject: [PATCH 21/57] =?UTF-8?q?WORKON=5FHOME=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index a59b67f2aa..30eac4d32d 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -5,9 +5,6 @@ name: pr-test on: pull_request: -env: - WORKON_HOME: /tmp/.venv - jobs: # PRが来たらformatをかけてみて、差分があればPRを作って、エラーで落ちるjob pr-format: @@ -265,7 +262,7 @@ jobs: - name: Set venv_path run: | NAME="${GITHUB_REPOSITORY##*/}-*" - venv_path=$(find ${{ env.WORKON_HOME }} -name "${NAME}") + venv_path=$(find ${WORKON_HOME} -name "${NAME}") echo "${venv_path}" echo "venv_path=${venv_path}" >> "${GITHUB_ENV}" From 576df7ab5e000fceef5c32d339df42430081892a Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 10:06:19 +0900 Subject: [PATCH 22/57] =?UTF-8?q?path=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 30eac4d32d..b1ccae005d 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -262,7 +262,7 @@ jobs: - name: Set venv_path run: | NAME="${GITHUB_REPOSITORY##*/}-*" - venv_path=$(find ${WORKON_HOME} -name "${NAME}") + venv_path=$(pipenv --venv) echo "${venv_path}" echo "venv_path=${venv_path}" >> "${GITHUB_ENV}" From 93275744d05b862c7907f01a1d15c7e17358909f Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 10:22:29 +0900 Subject: [PATCH 23/57] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index b1ccae005d..b9378183ef 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -244,24 +244,10 @@ jobs: run: | pipenv install --dev - # pipenvの仕様で、project直下の.venvの場合は .venv/lib/... にインストールされるが、 - # WORKON_HOMEを設定してインストール先をずらした場合は - # .venv/hato-bot-(hash)/lib/... にインストールされる。 - # 参考URL: https://bit.ly/2CnKOtJ - # - # ${GITHUB_REPOSITORY##*/} - # GITHUB_REPOSITORYは dev-hato/hato-bot のように入るので、 - # シェル芸で hato-bot のみ取り出している。 - # 他に持っていっても使えるようにした。 - # 参考URL: https://bit.ly/2PP4IRt - # - # log出力のためにfindコマンド単体も置いている - # # 環境ファイルを使ってenvにsetしている # 参考URL: https://bit.ly/2KJhjqk - name: Set venv_path run: | - NAME="${GITHUB_REPOSITORY##*/}-*" venv_path=$(pipenv --venv) echo "${venv_path}" echo "venv_path=${venv_path}" >> "${GITHUB_ENV}" From 47c6bc26b719b608b12e55249c8b13db31762eea Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 10:29:10 +0900 Subject: [PATCH 24/57] =?UTF-8?q?Node.js=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E6=8C=87=E5=AE=9A=E3=81=8B=E3=82=89?= =?UTF-8?q?.x=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-check-yarn.yml | 2 +- .github/workflows/pr-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-check-yarn.yml b/.github/workflows/pr-check-yarn.yml index 85854d0b8a..efe8389c14 100644 --- a/.github/workflows/pr-check-yarn.yml +++ b/.github/workflows/pr-check-yarn.yml @@ -16,7 +16,7 @@ jobs: # submodule: 'recursive' fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - - run: echo "NODE_VERSION=16.x" >> "${GITHUB_ENV}" + - run: echo "NODE_VERSION=16" >> "${GITHUB_ENV}" - name: Set up Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v2.5.1 with: diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index b9378183ef..13848a6717 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -260,7 +260,7 @@ jobs: run: | DEST_PATH="/home/runner/work/_temp/_github_workflow/.venv" cp -r ${{ env.venv_path }} "${DEST_PATH}" - - run: echo "NODE_VERSION=16.x" >> "${GITHUB_ENV}" + - run: echo "NODE_VERSION=16" >> "${GITHUB_ENV}" - name: Set up Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v2.5.1 with: From 359435c4b375efd7afc1e7c61651d5b0461e9b6e Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 10:32:28 +0900 Subject: [PATCH 25/57] =?UTF-8?q?Revert=20"=E3=83=A1=E3=83=B3=E3=83=86?= =?UTF-8?q?=E3=83=8A=E3=83=B3=E3=82=B9=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E5=89=8A=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b47fe89a7f947ac415e35ae5aec38af98144406b. --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index bd28b9c5c2..0a590336d5 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9 +3.9.10 From 5033ccff0b6d855dd8e6d44616dbf1fd0b721672 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 16:58:15 +0900 Subject: [PATCH 26/57] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=82=92=E5=8F=8D?= =?UTF-8?q?=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-format.yml | 35 +++++++++------------------------ 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pr-format.yml b/.github/workflows/pr-format.yml index a50d831be6..bedc1db1f8 100644 --- a/.github/workflows/pr-format.yml +++ b/.github/workflows/pr-format.yml @@ -1,20 +1,14 @@ --- -name: pr-test +name: pr-format # pull_requestで何かあった時に起動する on: pull_request: -env: - WORKON_HOME: /tmp/.venv - jobs: # PRが来たらformatをかけてみて、差分があればPRを作って、エラーで落ちるjob pr-format: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9] steps: - uses: actions/checkout@v2 @@ -23,23 +17,12 @@ jobs: # submodule: 'recursive' fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - - name: Set up Python ${{ matrix.python-version }} + - run: echo "PYTHON_VERSION=$(cat .python-version)" >> "${GITHUB_ENV}" + - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v2.3.2 with: - python-version: ${{ matrix.python-version }} - - run: | - KEY="${{ hashFiles('./.github/workflows/pr-test.yml') }}" - KEY+="-${{ runner.os }}-${{ matrix.python-version }}-Dockerfile" - KEY+="-${{ hashFiles('./Dockerfile') }}-pipenv" - echo "KEY=${KEY}" >> "${GITHUB_ENV}" - - name: pipenv cache - uses: actions/cache@v2.1.7 - with: - key: ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - path: ${{ env.WORKON_HOME }} - restore-keys: | - ${{ env.KEY }}-${{ hashFiles('./Pipfile') }} - ${{ env.KEY }}- + python-version: ${{env.PYTHON_VERSION }} + cache: pipenv - name: Install pipenv id: install_pipenv continue-on-error: true @@ -110,7 +93,7 @@ jobs: GITHUB_HEAD="HEAD:refs/heads/fix-format-${HEAD_REF}" git push -f "${REPO_URL}" "${GITHUB_HEAD}" - name: Get PullRequests - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -134,7 +117,7 @@ jobs: return pulls.length # pushしたブランチでPRを作る - name: Create PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository @@ -163,7 +146,7 @@ jobs: ) return create_pull_res.data.number - name: Assign a user - uses: actions/github-script@v5 + uses: actions/github-script@v6 if: ${{ env.REPO_NAME == github.repository && (steps.install_pipenv.outcome == 'failure' || steps.format.outcome == 'failure') @@ -183,7 +166,7 @@ jobs: await github.rest.issues.addAssignees(issues_add_assignees_params) # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる - name: Close PullRequest - uses: actions/github-script@v5 + uses: actions/github-script@v6 env: HEAD_REF: ${{github.event.pull_request.head.ref}} if: ${{ env.REPO_NAME == github.repository From 9f6a26d46ad809a0db233d92d1efb0771432a024 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 17:00:15 +0900 Subject: [PATCH 27/57] =?UTF-8?q?TAG=5FNAME=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-test-hato-bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index e78baf47ca..16ba09bf2f 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -77,7 +77,7 @@ jobs: - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 - - run: echo "TAG_NAME=latest" >> "$GITHUB_ENV" + - run: echo "TAG_NAME=$(git symbolic-ref --short HEAD | sed -e "s:/:-:g")" >> "$GITHUB_ENV" - name: Build docker image run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 - name: Start docker From 112479cc6e1db09f0c33fde2a277bbc4832fa7f9 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 17:01:50 +0900 Subject: [PATCH 28/57] =?UTF-8?q?Revert=20"TAG=5FNAME=E4=BF=AE=E6=AD=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9f6a26d46ad809a0db233d92d1efb0771432a024. --- .github/workflows/pr-test-hato-bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test-hato-bot.yml b/.github/workflows/pr-test-hato-bot.yml index 16ba09bf2f..e78baf47ca 100644 --- a/.github/workflows/pr-test-hato-bot.yml +++ b/.github/workflows/pr-test-hato-bot.yml @@ -77,7 +77,7 @@ jobs: - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 - - run: echo "TAG_NAME=$(git symbolic-ref --short HEAD | sed -e "s:/:-:g")" >> "$GITHUB_ENV" + - run: echo "TAG_NAME=latest" >> "$GITHUB_ENV" - name: Build docker image run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 - name: Start docker From 66fba82ebcb6d52019128d96af6178a45ad9cb1b Mon Sep 17 00:00:00 2001 From: Atsushi Tanaka Date: Sat, 12 Feb 2022 18:10:24 +0900 Subject: [PATCH 29/57] Use slim super-linter --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 85ff7a2f08..2ed09072e5 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -70,7 +70,7 @@ jobs: - run: | 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}" - name: Lint files - uses: github/super-linter@v4.8.7 + uses: github/super-linter/slim@v4.8.7 env: VALIDATE_ALL_CODEBASE: true VALIDATE_PYTHON_BLACK: false From 37415afd46db703cfa30a8ee4e904733cddbff5d Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 18:14:37 +0900 Subject: [PATCH 30/57] =?UTF-8?q?.python-version=20=E3=82=92Docker?= =?UTF-8?q?=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=A8=E5=90=8C=E6=9C=9F?= =?UTF-8?q?=E3=81=95=E3=81=9B=E3=82=8BCI=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python.yml | 169 ++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 .github/workflows/update_python.yml diff --git a/.github/workflows/update_python.yml b/.github/workflows/update_python.yml new file mode 100644 index 0000000000..3066e619e1 --- /dev/null +++ b/.github/workflows/update_python.yml @@ -0,0 +1,169 @@ +--- +name: update-python + +on: + pull_request: + +jobs: + # .python-version をDockerイメージと同期させる + update-version: + runs-on: ubuntu-latest + env: + DOCKER_BUILDKIT: 1 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + - name: Get Python version + id: get_python_version + run: | + image_name=hato_bot + docker build -t "${image_name}" . + DOCKER_CMD="python --version 2>&1 | sed -e 's/^Python //g'" + python_version=$(docker run ${image_name} sh -c "${DOCKER_CMD}") + echo "Python version:" "${python_version}" + echo "::set-output name=python_version::${python_version}" + - name: Update versions + run: | + PYTHON_VERSION="${{steps.get_python_version.outputs.python_version}}" + echo "${PYTHON_VERSION}" > .python-version + # 差分があったときは差分を出力する + - name: Show diff + id: diff + run: | + result=$(git diff) + echo "::set-output name=result::$result" + - run: | + REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}" + echo "REPO_NAME=${REPO_NAME}" >> "${GITHUB_ENV}" + # 差分があったときは、コミットを作りpushする + - name: Push + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' }} + run: | + git config user.name "github-actions[bot]" + EMAIL="41898282+github-actions[bot]@users.noreply.github.com" + git config user.email "${EMAIL}" + git add -u + git commit -m "鳩は唐揚げ！(自動で直してあげたよ！)" + REPO_URL="https://" + REPO_URL+="${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/" + REPO_URL+="${{github.repository}}.git" + GITHUB_HEAD="HEAD:refs/heads/fix-version-${HEAD_REF}" + git push -f "${REPO_URL}" "${GITHUB_HEAD}" + - name: Get PullRequests + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' }} + id: get_pull_requests + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const pulls_list_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-version-" + HEAD_REF, + base: HEAD_REF, + state: "open" + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + return pulls.length + # pushしたブランチでPRを作る + - name: Create PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' + && steps.get_pull_requests.outputs.result == 0 }} + id: create_pull_request + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const number = "#${{github.event.pull_request.number}}" + let title = ".python-versionを直してあげたよ！PRをマージしてね！ " + title += number + const pulls_create_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-version-" + HEAD_REF, + base: HEAD_REF, + title, + body: "鳩の唐揚げおいしい！😋😋😋 " + number + } + console.log("call pulls.create:", pulls_create_params) + const create_pull_res = await github.rest.pulls.create( + pulls_create_params + ) + return create_pull_res.data.number + - name: Assign a user + uses: actions/github-script@v5 + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' + && steps.get_pull_requests.outputs.result == 0 + && github.event.pull_request.user.login != 'dependabot[bot]' }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const issues_add_assignees_params = { + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: ${{steps.create_pull_request.outputs.result}}, + assignees: ["${{github.event.pull_request.user.login}}"] + } + console.log("call issues.addAssignees:") + console.log(issues_add_assignees_params) + await github.rest.issues.addAssignees(issues_add_assignees_params) + # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる + - name: Close PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result == '' }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const head_name = "fix-version-" + HEAD_REF + const common_params = { + owner: context.repo.owner, + repo: context.repo.repo + } + const pulls_list_params = { + head: "dev-hato:" + head_name, + base: HEAD_REF, + state: "open", + ...common_params + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + + for (const pull of pulls) { + const pulls_update_params = { + pull_number: pull.number, + state: "closed", + ...common_params + } + console.log("call pulls.update:", pulls_update_params) + await github.rest.pulls.update(pulls_update_params) + const git_deleteRef_params = { + ref: "heads/" + head_name, + ...common_params + } + console.log("call git.deleteRef:", git_deleteRef_params) + await github.rest.git.deleteRef(git_deleteRef_params) + } + - name: Exit + if: ${{ steps.diff.outputs.result != '' }} + run: exit 1 From 1fd902f536a15addd00887be19d4fc13fe08be5a Mon Sep 17 00:00:00 2001 From: bgpat Date: Sat, 12 Feb 2022 18:24:06 +0900 Subject: [PATCH 31/57] Add dotenv-linter --- .github/workflows/pr-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 2ed09072e5..c5cb5e9b80 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -80,3 +80,5 @@ jobs: WORKON_HOME: "" PYTHONPATH: ${{ env.PYTHONPATH }} PATH: /github/workspace/node_modules/.bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/node_modules/.bin:/venvs/ansible-lint/bin:/venvs/black/bin:/venvs/cfn-lint/bin:/venvs/cpplint/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/mypy/bin:/venvs/pylint/bin:/venvs/snakefmt/bin:/venvs/snakemake/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin:/venvs/yq/bin:/var/cache/dotnet/tools:/usr/share/dotnet + - name: Lint dotenv + uses: dotenv-linter/action-dotenv-linter@v2.15.0 From 83ae55ebe629fed9d2fa3ea2e731827a7313f416 Mon Sep 17 00:00:00 2001 From: Masaya Suzuki <15100604+massongit@users.noreply.github.com> Date: Sat, 12 Feb 2022 18:40:43 +0900 Subject: [PATCH 32/57] =?UTF-8?q?.python-version=E3=82=92sudden-death?= =?UTF-8?q?=E3=81=AB=E5=90=8C=E6=9C=9F=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-copy-ci-hato-bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-copy-ci-hato-bot.yml b/.github/workflows/pr-copy-ci-hato-bot.yml index 529165c159..10cefaf177 100644 --- a/.github/workflows/pr-copy-ci-hato-bot.yml +++ b/.github/workflows/pr-copy-ci-hato-bot.yml @@ -35,7 +35,7 @@ jobs: do cp hato-bot/.github/linters/${f} sudden-death/.github/linters/ done - for f in .gitleaks.toml .pre-commit-config.yaml package.json yarn.lock + for f in .gitleaks.toml .pre-commit-config.yaml .python-version package.json yarn.lock do cp hato-bot/${f} sudden-death/ done From c2d4f340b287d07cfd505916a66f5287741deae6 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 18:50:08 +0900 Subject: [PATCH 33/57] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_python.yml b/.github/workflows/update_python.yml index 3066e619e1..e75589b458 100644 --- a/.github/workflows/update_python.yml +++ b/.github/workflows/update_python.yml @@ -123,7 +123,7 @@ jobs: console.log("call issues.addAssignees:") console.log(issues_add_assignees_params) await github.rest.issues.addAssignees(issues_add_assignees_params) - # 既にformat修正のPRがある状態で、手動でformatを修正した場合、format修正のPRを閉じる + # 既にバージョン同期のPRがある状態で、手動でバージョンを修正した場合、バージョン同期のPRを閉じる - name: Close PullRequest uses: actions/github-script@v5 env: From 973258fef2e68052873c86dc4de1733d16c4362d Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 19:04:36 +0900 Subject: [PATCH 34/57] =?UTF-8?q?CI=20update-python=20=E3=81=AFsudden-deat?= =?UTF-8?q?h=E3=81=AB=E5=90=8C=E6=9C=9F=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflows/{update_python.yml => update_python-hato-bot.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{update_python.yml => update_python-hato-bot.yml} (99%) diff --git a/.github/workflows/update_python.yml b/.github/workflows/update_python-hato-bot.yml similarity index 99% rename from .github/workflows/update_python.yml rename to .github/workflows/update_python-hato-bot.yml index e75589b458..077dfe4f7d 100644 --- a/.github/workflows/update_python.yml +++ b/.github/workflows/update_python-hato-bot.yml @@ -1,5 +1,5 @@ --- -name: update-python +name: update-python-hato-bot on: pull_request: From 5aa827c8e9732e36b288480078ade82309396705 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 12 Feb 2022 19:27:31 +0900 Subject: [PATCH 35/57] =?UTF-8?q?Pipfile=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92.python-version=E3=81=A8?= =?UTF-8?q?=E5=90=8C=E6=9C=9F=E3=81=99=E3=82=8BCI=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python-hato-bot.yml | 10 +- .github/workflows/update_python.yml | 157 +++++++++++++++++++ 2 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/update_python.yml diff --git a/.github/workflows/update_python-hato-bot.yml b/.github/workflows/update_python-hato-bot.yml index 077dfe4f7d..ffa178890a 100644 --- a/.github/workflows/update_python-hato-bot.yml +++ b/.github/workflows/update_python-hato-bot.yml @@ -6,7 +6,7 @@ on: jobs: # .python-version をDockerイメージと同期させる - update-version: + update-version-python-version: runs-on: ubuntu-latest env: DOCKER_BUILDKIT: 1 @@ -52,7 +52,7 @@ jobs: REPO_URL="https://" REPO_URL+="${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/" REPO_URL+="${{github.repository}}.git" - GITHUB_HEAD="HEAD:refs/heads/fix-version-${HEAD_REF}" + GITHUB_HEAD="HEAD:refs/heads/fix-version-${HEAD_REF}-python-version" git push -f "${REPO_URL}" "${GITHUB_HEAD}" - name: Get PullRequests uses: actions/github-script@v5 @@ -68,7 +68,7 @@ jobs: const pulls_list_params = { owner: context.repo.owner, repo: context.repo.repo, - head: "dev-hato:fix-version-" + HEAD_REF, + head: "dev-hato:fix-version-" + HEAD_REF + "-python-version", base: HEAD_REF, state: "open" } @@ -95,7 +95,7 @@ jobs: const pulls_create_params = { owner: context.repo.owner, repo: context.repo.repo, - head: "dev-hato:fix-version-" + HEAD_REF, + head: "dev-hato:fix-version-" + HEAD_REF + "-python-version", base: HEAD_REF, title, body: "鳩の唐揚げおいしい！😋😋😋 " + number @@ -134,7 +134,7 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} script: | const HEAD_REF = process.env["HEAD_REF"] - const head_name = "fix-version-" + HEAD_REF + const head_name = "fix-version-" + HEAD_REF + "-python-version" const common_params = { owner: context.repo.owner, repo: context.repo.repo diff --git a/.github/workflows/update_python.yml b/.github/workflows/update_python.yml new file mode 100644 index 0000000000..76f1a2b0c1 --- /dev/null +++ b/.github/workflows/update_python.yml @@ -0,0 +1,157 @@ +--- +name: update-python + +on: + pull_request: + +jobs: + # Pipfile をDockerイメージと同期させる + update-version-pipfile: + runs-on: ubuntu-latest + env: + DOCKER_BUILDKIT: 1 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + - run: sed -i -e "s/^python_version = \".*\"$/python_version = \"$(cat .python-version)\"/g" Pipfile + # 差分があったときは差分を出力する + - name: Show diff + id: diff + run: | + result=$(git diff) + echo "::set-output name=result::$result" + - run: | + REPO_NAME="${{ github.event.pull_request.head.repo.full_name }}" + echo "REPO_NAME=${REPO_NAME}" >> "${GITHUB_ENV}" + # 差分があったときは、コミットを作りpushする + - name: Push + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' }} + run: | + git config user.name "github-actions[bot]" + EMAIL="41898282+github-actions[bot]@users.noreply.github.com" + git config user.email "${EMAIL}" + git add -u + git commit -m "鳩は唐揚げ！(自動で直してあげたよ！)" + REPO_URL="https://" + REPO_URL+="${{github.actor}}:${{secrets.GITHUB_TOKEN}}@github.com/" + REPO_URL+="${{github.repository}}.git" + GITHUB_HEAD="HEAD:refs/heads/fix-version-${HEAD_REF}-pipfile" + git push -f "${REPO_URL}" "${GITHUB_HEAD}" + - name: Get PullRequests + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' }} + id: get_pull_requests + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const pulls_list_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-version-" + HEAD_REF + '-pipfile', + base: HEAD_REF, + state: "open" + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + return pulls.length + # pushしたブランチでPRを作る + - name: Create PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' + && steps.get_pull_requests.outputs.result == 0 }} + id: create_pull_request + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const number = "#${{github.event.pull_request.number}}" + let title = "Pipfileを直してあげたよ！PRをマージしてね！ " + title += number + const pulls_create_params = { + owner: context.repo.owner, + repo: context.repo.repo, + head: "dev-hato:fix-version-" + HEAD_REF + '-pipfile', + base: HEAD_REF, + title, + body: "鳩の唐揚げおいしい！😋😋😋 " + number + } + console.log("call pulls.create:", pulls_create_params) + const create_pull_res = await github.rest.pulls.create( + pulls_create_params + ) + return create_pull_res.data.number + - name: Assign a user + uses: actions/github-script@v5 + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result != '' + && steps.get_pull_requests.outputs.result == 0 + && github.event.pull_request.user.login != 'dependabot[bot]' }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const issues_add_assignees_params = { + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: ${{steps.create_pull_request.outputs.result}}, + assignees: ["${{github.event.pull_request.user.login}}"] + } + console.log("call issues.addAssignees:") + console.log(issues_add_assignees_params) + await github.rest.issues.addAssignees(issues_add_assignees_params) + # 既にバージョン同期のPRがある状態で、手動でバージョンを修正した場合、バージョン同期のPRを閉じる + - name: Close PullRequest + uses: actions/github-script@v5 + env: + HEAD_REF: ${{github.event.pull_request.head.ref}} + if: ${{ env.REPO_NAME == github.repository + && steps.diff.outputs.result == '' }} + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const HEAD_REF = process.env["HEAD_REF"] + const head_name = "fix-version-" + HEAD_REF + '-pipfile' + const common_params = { + owner: context.repo.owner, + repo: context.repo.repo + } + const pulls_list_params = { + head: "dev-hato:" + head_name, + base: HEAD_REF, + state: "open", + ...common_params + } + console.log("call pulls.list:", pulls_list_params) + const pulls = await github.paginate(github.rest.pulls.list, + pulls_list_params) + + for (const pull of pulls) { + const pulls_update_params = { + pull_number: pull.number, + state: "closed", + ...common_params + } + console.log("call pulls.update:", pulls_update_params) + await github.rest.pulls.update(pulls_update_params) + const git_deleteRef_params = { + ref: "heads/" + head_name, + ...common_params + } + console.log("call git.deleteRef:", git_deleteRef_params) + await github.rest.git.deleteRef(git_deleteRef_params) + } + - name: Exit + if: ${{ steps.diff.outputs.result != '' }} + run: exit 1 From bef96c93f10e226f26ae1b33df9b4520972446c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 10:33:54 +0000 Subject: [PATCH 36/57] Bump postgres from 14.1-alpine to 14.2-alpine in /setup/pgsql Bumps postgres from 14.1-alpine to 14.2-alpine. --- updated-dependencies: - dependency-name: postgres dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- setup/pgsql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/pgsql/Dockerfile b/setup/pgsql/Dockerfile index 0d983e01aa..7299d39dd3 100644 --- a/setup/pgsql/Dockerfile +++ b/setup/pgsql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:14.1-alpine +FROM postgres:14.2-alpine # 実行時に必要なパッケージ (グループ名: .used-packages) # * openssl: PostgreSQLとSSL通信する時に必要。 From 62e98a0e3f1e0d70564bb1a68e38e589c5f99243 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Tue, 15 Feb 2022 20:53:21 +0900 Subject: [PATCH 37/57] =?UTF-8?q?Docker=E3=82=A4=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92Debian=E3=83=99=E3=83=BC=E3=82=B9=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-docker-hato-bot.yml | 10 ++++------ Dockerfile | 21 ++++++++------------- setup/docker-compose.yml | 8 +------- setup/pgsql/Dockerfile | 5 ----- 4 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 setup/pgsql/Dockerfile diff --git a/.github/workflows/pr-docker-hato-bot.yml b/.github/workflows/pr-docker-hato-bot.yml index 44a8c80016..53cc799ba5 100644 --- a/.github/workflows/pr-docker-hato-bot.yml +++ b/.github/workflows/pr-docker-hato-bot.yml @@ -44,10 +44,8 @@ jobs: run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 - run: docker-compose push - run: | - for image in postgres hato-bot; do - image_name="ghcr.io/dev-hato/hato-bot/${image}" - latest_tag="${image_name}:latest" - docker tag "${image_name}:${TAG_NAME}" "${latest_tag}" - docker push "${latest_tag}" - done + image_name="ghcr.io/dev-hato/hato-bot/hato-bot" + latest_tag="${image_name}:latest" + docker tag "${image_name}:${TAG_NAME}" "${latest_tag}" + docker push "${latest_tag}" if: ${{ github.event_name == 'release' }} diff --git a/Dockerfile b/Dockerfile index 3b2058ba63..fecf16cf1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,24 @@ # バージョン情報に表示する commit hash を埋め込む -FROM alpine:3.15.0 AS commit-hash +FROM debian:buster-slim AS commit-hash COPY . / -RUN apk add --no-cache -U git \ +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.9.10-alpine +FROM --platform=linux/amd64 python:3.9.10-slim-buster WORKDIR /usr/src/app COPY Pipfile Pipfile -# 実行時に必要なパッケージ (グループ名: .used-packages) -# * postgresql-libs: psycopg2を使用する際に必要 -# * libjpeg-turbo: Pillowを使用する際に必要 -# -# Pythonライブラリのインストール時に必要なパッケージ (グループ名: .build-deps, Pythonライブラリインストール後にアンインストール) -# * jpeg-dev, zlib-dev: Pillowのインストールの際に必要 -# * gcc, musl-dev, postgresql-dev: psycopg2のインストールの際に必要 +# Pythonライブラリのインストール時に必要なパッケージ (Pythonライブラリインストール後にアンインストール) # * git: Pythonライブラリのインストールの際に必要 -RUN apk add --no-cache -t .used-packages postgresql-libs libjpeg-turbo && \ - apk add --no-cache -t .build-deps jpeg-dev zlib-dev gcc musl-dev postgresql-dev git && \ +RUN apt-get update && \ + apt-get install -y --no-install-recommends git && \ pip install pipenv==2022.1.8 --no-cache-dir && \ pipenv install --system --skip-lock && \ pip uninstall -y pipenv virtualenv && \ - apk --purge del .build-deps && \ + apt-get remove -y git && \ rm -rf ~/.cache COPY *.py ./ diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml index c148e03f12..5781c953a2 100644 --- a/setup/docker-compose.yml +++ b/setup/docker-compose.yml @@ -5,13 +5,7 @@ volumes: driver: "local" services: postgres: - build: - dockerfile: ./Dockerfile - context: ./pgsql - cache_from: - - ghcr.io/dev-hato/hato-bot/postgres:${TAG_NAME} - - ghcr.io/dev-hato/hato-bot/postgres - image: ghcr.io/dev-hato/hato-bot/postgres:${TAG_NAME} + image: postgres:14.2-bullseye environment: POSTGRES_PASSWORD: password restart: always diff --git a/setup/pgsql/Dockerfile b/setup/pgsql/Dockerfile deleted file mode 100644 index 7299d39dd3..0000000000 --- a/setup/pgsql/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM postgres:14.2-alpine - -# 実行時に必要なパッケージ (グループ名: .used-packages) -# * openssl: PostgreSQLとSSL通信する時に必要。 -RUN apk add --no-cache -t .used-packages openssl From 676efed77b47e857f45aa154e693b092aa344188 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Tue, 15 Feb 2022 21:03:50 +0900 Subject: [PATCH 38/57] =?UTF-8?q?hadolint=E3=81=AB=E3=82=88=E3=82=8B?= =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- setup/docker-compose.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fecf16cf1f..9e629dbdae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ FROM debian:buster-slim AS commit-hash COPY . / RUN apt-get update \ - && apt-get install -y --no-install-recommends git \ + && apt-get install -y --no-install-recommends git=1:2.20.1-2+deb10u3 \ && sed -i "s/^\(GIT_COMMIT_HASH = \).*\$/\1'$(git rev-parse HEAD)'/" slackbot_settings.py -FROM --platform=linux/amd64 python:3.9.10-slim-buster +FROM python:3.9.10-slim-buster WORKDIR /usr/src/app @@ -14,7 +14,7 @@ COPY Pipfile Pipfile # Pythonライブラリのインストール時に必要なパッケージ (Pythonライブラリインストール後にアンインストール) # * git: Pythonライブラリのインストールの際に必要 RUN apt-get update && \ - apt-get install -y --no-install-recommends git && \ + apt-get install -y --no-install-recommends git=1:2.20.1-2+deb10u3 && \ pip install pipenv==2022.1.8 --no-cache-dir && \ pipenv install --system --skip-lock && \ pip uninstall -y pipenv virtualenv && \ diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml index 5781c953a2..1ca72e2fe2 100644 --- a/setup/docker-compose.yml +++ b/setup/docker-compose.yml @@ -22,6 +22,7 @@ services: - ghcr.io/dev-hato/hato-bot/hato-bot:${TAG_NAME} - ghcr.io/dev-hato/hato-bot/hato-bot image: ghcr.io/dev-hato/hato-bot/hato-bot:${TAG_NAME} + platform: linux/amd64 env_file: - ../.env restart: always From 0ecc1f22a5ad4eb219eecdbbb1fc01e28c8c9a23 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 16 Feb 2022 00:56:24 +0900 Subject: [PATCH 39/57] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E5=89=8A=E9=99=A4=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9e629dbdae..b46e4eadca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,8 @@ RUN apt-get update && \ pipenv install --system --skip-lock && \ pip uninstall -y pipenv virtualenv && \ apt-get remove -y git && \ - rm -rf ~/.cache + apt-get clean && \ + rm -rf /var/lib/apt/lists/* ~/.cache COPY *.py ./ COPY library library From cbb042d72f52f8c03515ff3363db0e2dcbb601a2 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 16 Feb 2022 01:02:32 +0900 Subject: [PATCH 40/57] ignore DL3008 --- .github/linters/.hadolint.yaml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/linters/.hadolint.yaml b/.github/linters/.hadolint.yaml index ea54bce896..22537ae3c2 100644 --- a/.github/linters/.hadolint.yaml +++ b/.github/linters/.hadolint.yaml @@ -1,3 +1,3 @@ --- ignored: - - DL3018 + - DL3008 diff --git a/Dockerfile b/Dockerfile index b46e4eadca..90ecc9ec79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim AS commit-hash COPY . / RUN apt-get update \ - && apt-get install -y --no-install-recommends git=1:2.20.1-2+deb10u3 \ + && 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.9.10-slim-buster @@ -14,7 +14,7 @@ COPY Pipfile Pipfile # Pythonライブラリのインストール時に必要なパッケージ (Pythonライブラリインストール後にアンインストール) # * git: Pythonライブラリのインストールの際に必要 RUN apt-get update && \ - apt-get install -y --no-install-recommends git=1:2.20.1-2+deb10u3 && \ + apt-get install -y --no-install-recommends git && \ pip install pipenv==2022.1.8 --no-cache-dir && \ pipenv install --system --skip-lock && \ pip uninstall -y pipenv virtualenv && \ From 8f4f09f2a90ea11ea706fd7e9069e718ef7c1c1a Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 16 Feb 2022 01:22:53 +0900 Subject: [PATCH 41/57] =?UTF-8?q?=E4=BD=99=E5=88=86=E3=81=AA=E3=82=B9?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B9=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90ecc9ec79..8cb30e3e44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim AS commit-hash COPY . / RUN apt-get update \ - && apt-get install -y --no-install-recommends git \ + && 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.9.10-slim-buster @@ -14,7 +14,7 @@ COPY Pipfile Pipfile # Pythonライブラリのインストール時に必要なパッケージ (Pythonライブラリインストール後にアンインストール) # * git: Pythonライブラリのインストールの際に必要 RUN apt-get update && \ - apt-get install -y --no-install-recommends git && \ + apt-get install -y --no-install-recommends git && \ pip install pipenv==2022.1.8 --no-cache-dir && \ pipenv install --system --skip-lock && \ pip uninstall -y pipenv virtualenv && \ From f75e865cc27bd9e9555f5078089a341b433720ed Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 16 Feb 2022 08:40:04 +0900 Subject: [PATCH 42/57] =?UTF-8?q?bullseye=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8cb30e3e44..1a66bf6297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ # バージョン情報に表示する commit hash を埋め込む -FROM debian:buster-slim AS commit-hash +FROM debian:bullseye-slim AS commit-hash COPY . / 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.9.10-slim-buster +FROM python:3.9.10-slim-bullseye WORKDIR /usr/src/app From 12e0340ad9fbf497607cb6771b30e7062059d550 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 03:45:16 +0000 Subject: [PATCH 43/57] Bump github/super-linter from 4.8.7 to 4.9.0 Bumps [github/super-linter](https://github.com/github/super-linter) from 4.8.7 to 4.9.0. - [Release notes](https://github.com/github/super-linter/releases) - [Changelog](https://github.com/github/super-linter/blob/main/docs/release-process.md) - [Commits](https://github.com/github/super-linter/compare/v4.8.7...v4.9.0) --- updated-dependencies: - dependency-name: github/super-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index c5cb5e9b80..27033319ab 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -70,7 +70,7 @@ jobs: - run: | 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}" - name: Lint files - uses: github/super-linter/slim@v4.8.7 + uses: github/super-linter/slim@v4.9.0 env: VALIDATE_ALL_CODEBASE: true VALIDATE_PYTHON_BLACK: false From 0c5f36cd1369a6fa30c2c8e5e75a39903101bd45 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Thu, 17 Feb 2022 09:28:58 +0900 Subject: [PATCH 44/57] =?UTF-8?q?sqlfluff=E3=81=AE=E6=8C=87=E6=91=98?= =?UTF-8?q?=E4=BA=8B=E9=A0=85=E4=BF=AE=E6=AD=A3=E3=83=BBsqlfluff=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/linters/.sqlfluff | 2 ++ setup/pgsql-init/02_init.sql | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .github/linters/.sqlfluff diff --git a/.github/linters/.sqlfluff b/.github/linters/.sqlfluff new file mode 100644 index 0000000000..7fb4ec3d03 --- /dev/null +++ b/.github/linters/.sqlfluff @@ -0,0 +1,2 @@ +[sqlfluff] +dialect = postgres diff --git a/setup/pgsql-init/02_init.sql b/setup/pgsql-init/02_init.sql index 86b84393a4..f8c1b99b49 100644 --- a/setup/pgsql-init/02_init.sql +++ b/setup/pgsql-init/02_init.sql @@ -1,6 +1,6 @@ CREATE TABLE IF NOT EXISTS vocabulary ( - "no" SERIAL UNIQUE, + no SERIAL UNIQUE, word TEXT ); CREATE TABLE IF NOT EXISTS slack_client_msg_id From e4d2d7da41412d8038ebebd9af73fc36083fda5a Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Thu, 17 Feb 2022 20:33:10 +0900 Subject: [PATCH 45/57] =?UTF-8?q?permissions=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python-hato-bot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update_python-hato-bot.yml b/.github/workflows/update_python-hato-bot.yml index ffa178890a..b2c7e17e5b 100644 --- a/.github/workflows/update_python-hato-bot.yml +++ b/.github/workflows/update_python-hato-bot.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest env: DOCKER_BUILDKIT: 1 + permissions: + pull-requests: write steps: - uses: actions/checkout@v2 with: From 9e638a7be1c5f38f8553ad53597b850c4c76d77e Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Thu, 17 Feb 2022 20:48:36 +0900 Subject: [PATCH 46/57] =?UTF-8?q?permission=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python-hato-bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_python-hato-bot.yml b/.github/workflows/update_python-hato-bot.yml index b2c7e17e5b..af3fd4fce5 100644 --- a/.github/workflows/update_python-hato-bot.yml +++ b/.github/workflows/update_python-hato-bot.yml @@ -11,7 +11,7 @@ jobs: env: DOCKER_BUILDKIT: 1 permissions: - pull-requests: write + contents: write steps: - uses: actions/checkout@v2 with: From 5bf82c445903c5ace5e478804dc3c63f1ad62b95 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Thu, 17 Feb 2022 20:50:51 +0900 Subject: [PATCH 47/57] =?UTF-8?q?permission=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_python-hato-bot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update_python-hato-bot.yml b/.github/workflows/update_python-hato-bot.yml index af3fd4fce5..d9d1ca8669 100644 --- a/.github/workflows/update_python-hato-bot.yml +++ b/.github/workflows/update_python-hato-bot.yml @@ -12,6 +12,7 @@ jobs: DOCKER_BUILDKIT: 1 permissions: contents: write + pull-requests: write steps: - uses: actions/checkout@v2 with: From 92b004f10b46c683dd4a8175d81ced21899b244a Mon Sep 17 00:00:00 2001 From: Masaya Suzuki <15100604+massongit@users.noreply.github.com> Date: Thu, 17 Feb 2022 21:06:40 +0900 Subject: [PATCH 48/57] =?UTF-8?q?postgres=E3=81=AEdependabot=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0068a285ce..284d420071 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,11 +11,6 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 1 - - package-ecosystem: docker - directory: "/setup/pgsql" - schedule: - interval: "daily" - open-pull-requests-limit: 1 - package-ecosystem: github-actions directory: "/" schedule: From 4c914db196d36aefeca6f007ded1874c287597b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:55:44 +0000 Subject: [PATCH 49/57] Bump python from 3.9.10-slim-bullseye to 3.10.2-slim-bullseye Bumps python from 3.9.10-slim-bullseye to 3.10.2-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a66bf6297..8f151fc620 100644 --- 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.9.10-slim-bullseye +FROM python:3.10.2-slim-bullseye WORKDIR /usr/src/app From 8cccf654dc2f72783230ded0c8399d2ce4c51114 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:56:34 +0000 Subject: [PATCH 50/57] =?UTF-8?q?=E9=B3=A9=E3=81=AF=E5=94=90=E6=8F=9A?= =?UTF-8?q?=E3=81=92=EF=BC=81(=E8=87=AA=E5=8B=95=E3=81=A7=E7=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=82=E3=81=92=E3=81=9F=E3=82=88=EF=BC=81?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 0a590336d5..7b59a5caab 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.9.10 +3.10.2 From 794451b3b0965c1c8638c6771598ad6b95568fa5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 16:01:58 +0000 Subject: [PATCH 51/57] =?UTF-8?q?=E9=B3=A9=E3=81=AF=E5=94=90=E6=8F=9A?= =?UTF-8?q?=E3=81=92=EF=BC=81(=E8=87=AA=E5=8B=95=E3=81=A7=E7=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=82=E3=81=92=E3=81=9F=E3=82=88=EF=BC=81?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 67b6569e52..2f012ae8fa 100644 --- a/Pipfile +++ b/Pipfile @@ -4,7 +4,7 @@ url = "https://pypi.org/simple" verify_ssl = true [requires] -python_version = "3.9.10" +python_version = "3.10.2" [dev-packages] autopep8 = "==1.6.0" From c8186a92a99616ffcfc81c939d0d193289c4372f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 22:04:55 +0000 Subject: [PATCH 52/57] Bump gitpython from 3.1.26 to 3.1.27 Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.26 to 3.1.27. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.26...3.1.27) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Pipfile | 2 +- Pipfile.lock | 155 +++++++++++++++++++++------------------------------ 2 files changed, 64 insertions(+), 93 deletions(-) diff --git a/Pipfile b/Pipfile index 2f012ae8fa..24013cd290 100644 --- a/Pipfile +++ b/Pipfile @@ -20,4 +20,4 @@ sudden-death = {git = "https://github.com/dev-hato/sudden-death", ref = "master" psycopg2-binary = "==2.9.3" slackeventsapi = "==3.0.1" slackclient = "==2.9.3" -gitpython = "==3.1.26" +gitpython = "==3.1.27" diff --git a/Pipfile.lock b/Pipfile.lock index effaf85722..9ef0077144 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3ba68c0c45ab3f73c226017a39573c94fe56965ea33e668a36187c23679c2bff" + "sha256": "f77c7abc07215c4c52eb26c08a5c09cf42ae7e6531df47e033d5ee36f6e77c8b" }, "pipfile-spec": 6, "requires": { @@ -127,11 +127,11 @@ }, "charset-normalizer": { "hashes": [ - "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45", - "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c" + "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", + "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], "markers": "python_version >= '3'", - "version": "==2.0.11" + "version": "==2.0.12" }, "click": { "hashes": [ @@ -143,11 +143,11 @@ }, "flask": { "hashes": [ - "sha256:7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2", - "sha256:cb90f62f1d8e4dc4621f52106613488b5ba826b2e1e10a33eac92f723093ab6a" + "sha256:59da8a3170004800a2837844bfa84d49b022550616070f7cb1a659682b2e7c9f", + "sha256:e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d" ], "markers": "python_version >= '3.6'", - "version": "==2.0.2" + "version": "==2.0.3" }, "frozenlist": { "hashes": [ @@ -224,11 +224,11 @@ }, "gitpython": { "hashes": [ - "sha256:26ac35c212d1f7b16036361ca5cff3ec66e11753a0d677fb6c48fa4e1a9dd8d6", - "sha256:fc8868f63a2e6d268fb25f481995ba185a85a66fcad126f039323ff6635669ee" + "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704", + "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d" ], "index": "pypi", - "version": "==3.1.26" + "version": "==3.1.27" }, "idna": { "hashes": [ @@ -240,11 +240,11 @@ }, "itsdangerous": { "hashes": [ - "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c", - "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0" + "sha256:29285842166554469a56d427addc0843914172343784cb909695fdbe90a3e129", + "sha256:d848fcb8bc7d507c4546b448574e8a44fc4ea2ba84ebf8d783290d53e81992f5" ], - "markers": "python_version >= '3.6'", - "version": "==2.0.1" + "markers": "python_version >= '3.7'", + "version": "==2.1.0" }, "jinja2": { "hashes": [ @@ -256,78 +256,49 @@ }, "markupsafe": { "hashes": [ - "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", - "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64", - "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b", - "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194", - "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567", - "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff", - "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724", - "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74", - "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646", - "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", - "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", - "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a", - "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6", - "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad", - "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", - "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38", - "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", - "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", - "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", - "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047", - "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", - "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f", - "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b", - "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", - "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", - "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", - "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", - "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1", - "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", - "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864", - "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914", - "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee", - "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f", - "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18", - "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8", - "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2", - "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d", - "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", - "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", - "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86", - "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6", - "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f", - "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", - "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833", - "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28", - "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e", - "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415", - "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", - "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f", - "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d", - "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9", - "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d", - "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145", - "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", - "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c", - "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", - "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a", - "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207", - "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f", - "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53", - "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd", - "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134", - "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85", - "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9", - "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", - "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94", - "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", - "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", - "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" + "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3", + "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8", + "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759", + "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed", + "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989", + "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3", + "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a", + "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c", + "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c", + "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8", + "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454", + "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad", + "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d", + "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635", + "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61", + "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea", + "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49", + "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce", + "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e", + "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f", + "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f", + "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f", + "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7", + "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a", + "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7", + "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076", + "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb", + "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7", + "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7", + "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c", + "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26", + "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c", + "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8", + "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448", + "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956", + "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05", + "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1", + "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357", + "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea", + "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730" ], - "markers": "python_version >= '3.6'", - "version": "==2.0.1" + "markers": "python_version >= '3.7'", + "version": "==2.1.0" }, "multidict": { "hashes": [ @@ -553,15 +524,15 @@ }, "sudden-death": { "git": "https://github.com/dev-hato/sudden-death", - "ref": "2a79e16673e8bea0d20347c7fe5818bed8d93815" + "ref": "4d076347362515389198a5655aa64c9fb3f4f5ec" }, "typing-extensions": { "hashes": [ - "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e", - "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b" + "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42", + "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2" ], "markers": "python_version >= '3.6'", - "version": "==4.0.1" + "version": "==4.1.1" }, "urllib3": { "hashes": [ @@ -676,11 +647,11 @@ }, "charset-normalizer": { "hashes": [ - "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45", - "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c" + "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", + "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], "markers": "python_version >= '3'", - "version": "==2.0.11" + "version": "==2.0.12" }, "idna": { "hashes": [ From 541e306f47936189446a1a5471afec0b09852aaa Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 23 Feb 2022 01:17:00 +0900 Subject: [PATCH 53/57] =?UTF-8?q?=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=AEtextl?= =?UTF-8?q?int=E3=83=AB=E3=83=BC=E3=83=AB=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/linters/.textlintrc | 3 +-- package.json | 3 +-- yarn.lock | 23 +---------------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/linters/.textlintrc b/.github/linters/.textlintrc index afd591f602..1cfcc1904e 100644 --- a/.github/linters/.textlintrc +++ b/.github/linters/.textlintrc @@ -36,7 +36,6 @@ "1.1.3.箇条書き": false, "4.3.1.丸かっこ（）": false, "4.3.2.大かっこ［］": false - }, - "spellcheck-tech-word": true + } } } diff --git a/package.json b/package.json index d908be5cb4..e43254ccb2 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "textlint-rule-prefer-tari-tari": "^1.0.3", "textlint-rule-preset-ja-spacing": "^2.2.0", "textlint-rule-preset-ja-technical-writing": "^7.0.0", - "textlint-rule-preset-jtf-style": "^2.3.12", - "textlint-rule-spellcheck-tech-word": "^5.0.0" + "textlint-rule-preset-jtf-style": "^2.3.12" }, "resolutions": { "ansi-regex": "^5.0.1" diff --git a/yarn.lock b/yarn.lock index 56db6189ea..48bf5e4a0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2087,14 +2087,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== -spellcheck-technical-word@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/spellcheck-technical-word/-/spellcheck-technical-word-2.0.0.tgz#cb0376b8bbda6239b6be009878cf81cf17080503" - integrity sha1-ywN2uLvaYjm2vgCYeM+BzxcIBQM= - dependencies: - structured-source "^3.0.2" - technical-word-rules "^1.4.2" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -2197,11 +2189,6 @@ table@^6.7.3: string-width "^4.2.3" strip-ansi "^6.0.1" -technical-word-rules@^1.4.2: - version "1.9.5" - resolved "https://registry.yarnpkg.com/technical-word-rules/-/technical-word-rules-1.9.5.tgz#49f0a9e78c6b2ef02a1a404790ddd8f5310aafbc" - integrity sha512-2sqzeb3aE23GtIO9fL9sDbqdt4vnoks7nWZRUgqEvYkjEmmQjrnVfl3WTURBZFrpgAXBNk0AMhWCj+17mzYXhw== - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -2233,7 +2220,7 @@ textlint-rule-helper@2.0.1: dependencies: unist-util-visit "^1.1.0" -textlint-rule-helper@^1.1.2, textlint-rule-helper@^1.1.5: +textlint-rule-helper@^1.1.5: version "1.2.0" resolved "https://registry.yarnpkg.com/textlint-rule-helper/-/textlint-rule-helper-1.2.0.tgz#be68d47a5146b16dd116278c9aeb7bd35631ccda" integrity sha1-vmjUelFGsW3RFieMmut701YxzNo= @@ -2618,14 +2605,6 @@ textlint-rule-sentence-length@^3.0.0: textlint-rule-helper "^2.1.1" textlint-util-to-string "^3.1.1" -textlint-rule-spellcheck-tech-word@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/textlint-rule-spellcheck-tech-word/-/textlint-rule-spellcheck-tech-word-5.0.0.tgz#279be31fd4b395e1f87b4a1ef6392f1504894c42" - integrity sha1-J5vjH9SzleH4e0oe9jkvFQSJTEI= - dependencies: - spellcheck-technical-word "^2.0.0" - textlint-rule-helper "^1.1.2" - textlint-util-to-string@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/textlint-util-to-string/-/textlint-util-to-string-2.1.1.tgz#7e456f16a2abc07e473cb9591acf19f110def2d1" From 56a6057add169430100cf91834fac47aa73a0a0c Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 23 Feb 2022 02:12:08 +0900 Subject: [PATCH 54/57] =?UTF-8?q?@proofdict/textlint-rule-proofdict?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/linters/.textlintrc | 3 + package.json | 2 + yarn.lock | 382 ++++++++++++++++++++++++++++++++++-- 3 files changed, 376 insertions(+), 11 deletions(-) diff --git a/.github/linters/.textlintrc b/.github/linters/.textlintrc index 1cfcc1904e..2ee3979e2a 100644 --- a/.github/linters/.textlintrc +++ b/.github/linters/.textlintrc @@ -2,6 +2,9 @@ "filters": {}, "rules": { "@textlint-ja/no-insert-dropping-sa": true, + "@proofdict/proofdict": { + "dictURL": "https://azu.github.io/proof-dictionary/" + }, "abbr-within-parentheses": true, "footnote-order": true, "general-novel-style-ja": { diff --git a/package.json b/package.json index e43254ccb2..0bfe41e459 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,12 @@ { "devDependencies": { + "@proofdict/textlint-rule-proofdict": "^3.1.2", "@textlint-ja/textlint-rule-no-insert-dropping-sa": "^2.0.1", "textlint": "^12.1.0", "textlint-rule-abbr-within-parentheses": "^1.0.2", "textlint-rule-footnote-order": "^1.0.3", "textlint-rule-general-novel-style-ja": "dev-hato/textlint-rule-general-novel-style-ja-markdown", + "textlint-rule-helper": "^2.2.1", "textlint-rule-ja-hiragana-fukushi": "^1.3.0", "textlint-rule-ja-hiragana-hojodoushi": "^1.0.4", "textlint-rule-ja-hiragana-keishikimeishi": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 48bf5e4a0e..e9aee44ef7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,6 +27,93 @@ check-more-types "2.24.0" lazy-ass "1.6.0" +"@kvs/env@^1.0.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@kvs/env/-/env-1.2.0.tgz#e5e28d229af08cc4e769b06d065feb61f99ee28f" + integrity sha512-MJVudIYrHg1E0AKrognxK5EdqKFjYSsHsa47WQf8rIyzoeSK614mnqJ+2+ZJr7nY9nUYkYsFivxXbQffIzcqcg== + dependencies: + "@kvs/indexeddb" "^1.2.0" + "@kvs/node-localstorage" "^1.2.0" + +"@kvs/indexeddb@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@kvs/indexeddb/-/indexeddb-1.2.0.tgz#c93a4c2eb7a368f3c01e2544f1f4d90921153a5b" + integrity sha512-elB0vtvM33ayqHVSL2jl5TMtoW/YaESuJVGf9yEO+8KZjhs+xxSDoUIEJYn9qD7pZc/LyMXVFBglr5Pxf2vWAQ== + dependencies: + "@kvs/types" "^1.2.0" + +"@kvs/node-localstorage@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@kvs/node-localstorage/-/node-localstorage-1.2.0.tgz#e771a7ca43b29294512b4d713e9c9e04ae4c0d4c" + integrity sha512-KJU0o2wjavwfTMpvfzA2vqPFOqb67n2UGvbsHi0bgwfVtkzd0fS/Ev/my9sayDHrXLx7SJJvXtqE8VM4nzEjqw== + dependencies: + "@kvs/storage" "^1.2.0" + app-root-path "^3.0.0" + mkdirp "^1.0.4" + node-localstorage "^2.1.6" + +"@kvs/storage@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@kvs/storage/-/storage-1.2.0.tgz#b9eaaed145dcba1a42891b2f418402b8b4a60d01" + integrity sha512-Zd9rA4U3/h8n3CxNUzMnsz5+UPOng1dXOc0MyEy0RQzF0XlWSTyOrxErn57bPbO0MHoHdw11MEzhDDRYsNj7ZA== + dependencies: + "@kvs/types" "^1.2.0" + +"@kvs/types@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@kvs/types/-/types-1.2.0.tgz#45e9e37865dff28a274145ea87857ec8e93515c6" + integrity sha512-88x1wFRMYg6DyCuX2jeLx2s8q7H3ayRtPD+OVhsSC5v7ek+FP7cv9ooVCC/+Ib5QzNWzkZpd4Uap6O9HrAxq6g== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@proofdict/tester@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@proofdict/tester/-/tester-3.1.0.tgz#8a824d53b56ca63bca281c0c1eaa4136ec03faac" + integrity sha512-qzeYjOfNwpt4WF6rN9YHLUsGF3OEGD+Zt3ZfJ1KDw2tKH8e2lr9bVsEIbq7v3KBgoGo43zgx3bNsPM/CuE027w== + dependencies: + "@proofdict/types" "^3.1.0" + prh "5.4.4" + +"@proofdict/textlint-rule-proofdict@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@proofdict/textlint-rule-proofdict/-/textlint-rule-proofdict-3.1.2.tgz#cd09f86c3503b49c31dcd8ec114158ec379371bb" + integrity sha512-UoAedRyxwbtWXbjLvxxSA0BcN5Ao5cNdM/kQUzs4ontygBxz2SON/4gg605RQa9VzF9yqURzk25nChRJXtCRzQ== + dependencies: + "@kvs/env" "^1.0.0" + "@proofdict/tester" "^3.1.0" + "@textlint/kernel" "^3.3.6" + "@textlint/types" "^1.4.5" + debug "^4.1.1" + fetch-ponyfill "^6.1.0" + globby "^10.0.1" + js-yaml "^3.13.1" + textlint-rule-helper "^2.1.1" + url-join "^4.0.1" + +"@proofdict/types@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@proofdict/types/-/types-3.1.0.tgz#e8f040392ec91c28c939957e4d16eb98a985090e" + integrity sha512-f8cxZ35ylr4n8TW/eUJ9KynEc484Tiocgl4a/ZZNS1dAH5G4vkJ+1AFw2ob/4dCiafy5tcue6TiZuWBFAmsS5g== + "@textlint-ja/textlint-rule-no-insert-dropping-sa@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@textlint-ja/textlint-rule-no-insert-dropping-sa/-/textlint-rule-no-insert-dropping-sa-2.0.1.tgz#7b193356b06aebfe4e19b1c12554215089862f40" @@ -69,6 +156,13 @@ "@textlint/ast-node-types" "^12.1.0" debug "^4.3.3" +"@textlint/ast-tester@^2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@textlint/ast-tester/-/ast-tester-2.3.5.tgz#897c5b09d84e67934ed1a81b488cd847072abb82" + integrity sha512-sbw0Edx22/Fa9fwObpus5KyhCnGKhyP1tU7flA7kwTi9EqQq2KFztz1c/QQWpgqymbdSPWg7HpAvGf4ru4FDZg== + dependencies: + "@textlint/ast-node-types" "^4.4.3" + "@textlint/ast-traverse@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/ast-traverse/-/ast-traverse-12.1.0.tgz#d7c95534b05c3eacae7e47014dd1e8df821d6c8d" @@ -76,11 +170,25 @@ dependencies: "@textlint/ast-node-types" "^12.1.0" +"@textlint/ast-traverse@^2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@textlint/ast-traverse/-/ast-traverse-2.3.5.tgz#b232b369b245a446abd511ddb0a64bcdc2f88949" + integrity sha512-yo1gIoXDx2bNs1JjC9viRxJpErNsfPtzb585KcVwWxxWmu3tXlT2iz13iKdjj5FMYPJe/PORe7lYqymkSUZ7kg== + dependencies: + "@textlint/ast-node-types" "^4.4.3" + "@textlint/feature-flag@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/feature-flag/-/feature-flag-12.1.0.tgz#b31e91357d774a71f794acc1de5436763fbbcaea" integrity sha512-pQfA2bUXimBQjxT5hVmGGuFf1Cwwx26kbrcwkGHsgxgXlXkg1zboby5UCMOjWda/TbJjynzqDO0JaU24Ms9fZg== +"@textlint/feature-flag@^3.3.5": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@textlint/feature-flag/-/feature-flag-3.3.5.tgz#81d9c073d4f836377211c68d2194451a63730258" + integrity sha512-S4JhbDQGu1Sutnvqs96nwxqwaErHrL49/QQDR8i/YNsINlurfKJbmktotb+w+qzeSibDibKzB8feOMVBXmO9Ww== + dependencies: + map-like "^2.0.0" + "@textlint/fixer-formatter@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/fixer-formatter/-/fixer-formatter-12.1.0.tgz#24f74b956d3433e41bf5c14052587ca8ce4aaec2" @@ -113,6 +221,23 @@ deep-equal "^1.1.1" structured-source "^3.0.2" +"@textlint/kernel@^3.3.6": + version "3.4.5" + resolved "https://registry.yarnpkg.com/@textlint/kernel/-/kernel-3.4.5.tgz#96b7db302e3fbb43e676fc8baae262388242922c" + integrity sha512-KGeOq4mbjPe3okDtPw7mbnTX/wP66ndmRKAoOz8gOKDIDRlH8nOG/av6k6xbVhdMk9+ZnomqU8jSSYwTZHzAnA== + dependencies: + "@textlint/ast-node-types" "^4.4.3" + "@textlint/ast-tester" "^2.3.5" + "@textlint/ast-traverse" "^2.3.5" + "@textlint/feature-flag" "^3.3.5" + "@textlint/source-code-fixer" "^3.4.5" + "@textlint/types" "^1.5.5" + "@textlint/utils" "^1.2.5" + debug "^4.3.1" + deep-equal "^1.1.1" + map-like "^2.0.0" + structured-source "^3.0.2" + "@textlint/linter-formatter@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/linter-formatter/-/linter-formatter-12.1.0.tgz#cc3982eab8321124a900770e6db4d0158b6be323" @@ -174,6 +299,14 @@ "@textlint/types" "^12.1.0" debug "^4.3.3" +"@textlint/source-code-fixer@^3.4.5": + version "3.4.5" + resolved "https://registry.yarnpkg.com/@textlint/source-code-fixer/-/source-code-fixer-3.4.5.tgz#d6952b78fb541e475f6b3e22e24c6b7afefdfdce" + integrity sha512-YUcBg6zs7H5ycLwWdfv5LHWlBx7iBAQL6vHY2uPw8AMPYgzU6/f91NGBU/QR7/FVw0e7v9zMngcRN1hMOxpFCw== + dependencies: + "@textlint/types" "^1.5.5" + debug "^4.3.1" + "@textlint/text-to-ast@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/text-to-ast/-/text-to-ast-12.1.0.tgz#ba19315a981fc319cf74ad5d7ec4a995d7c9452e" @@ -195,7 +328,7 @@ dependencies: "@textlint/text-to-ast" "^12.1.0" -"@textlint/types@^1.5.5": +"@textlint/types@^1.4.5", "@textlint/types@^1.5.5": version "1.5.5" resolved "https://registry.yarnpkg.com/@textlint/types/-/types-1.5.5.tgz#9c82dbcbf4e00116573f05c6739c6c8ec3b35304" integrity sha512-80P6fcqgsG9bP6JgR6W/E/oIx+71pplaicYCvvB4vMIeGk0OnWls4Q21kCpDYmq/C/ABtZ/Gy/Ov/8ExQPeQ7A== @@ -209,6 +342,11 @@ dependencies: "@textlint/ast-node-types" "^12.1.0" +"@textlint/utils@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@textlint/utils/-/utils-1.2.5.tgz#1406e179d44d130d8e60322f3f873a721c93ba75" + integrity sha512-2vgz4x3tKK+R9N0OlOovJClRCHubxZi86ki218cvRVpoU9pPrHwkwZud+rjItDl2xFBj7Gujww7c0W1wyytWVQ== + "@textlint/utils@^12.1.0": version "12.1.0" resolved "https://registry.yarnpkg.com/@textlint/utils/-/utils-12.1.0.tgz#42b034582a5eb8576f9457e16691d9556617bd40" @@ -219,6 +357,14 @@ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.30.tgz#dc1e40f7af3b9c815013a7860e6252f6352a84df" integrity sha512-orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ== +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + "@types/mdast@^3.0.0": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" @@ -226,6 +372,16 @@ dependencies: "@types/unist" "*" +"@types/minimatch@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/node@*": + version "17.0.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.19.tgz#726171367f404bfbe8512ba608a09ebad810c7e6" + integrity sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA== + "@types/structured-source@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/structured-source/-/structured-source-3.0.0.tgz#e95d76037d400c1957f3b709f023b308e92f3829" @@ -319,6 +475,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +app-root-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" + integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== + arg@4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -336,6 +497,11 @@ array-find-index@^1.0.2: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + array.prototype.find@^2.0.3: version "2.1.1" resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c" @@ -384,6 +550,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -535,7 +708,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.0.0, debug@^4.1.1, debug@^4.3.3: +debug@^4.0.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -579,6 +752,13 @@ diff@^4.0.1, diff@^4.0.2: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + disparity@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/disparity/-/disparity-3.0.0.tgz#605288e8ebf38c5ccfe1e0dbc49ca6f724096500" @@ -697,11 +877,29 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-glob@^3.0.3: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + fault@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13" @@ -709,6 +907,13 @@ fault@^1.0.0: dependencies: format "^0.2.0" +fetch-ponyfill@^6.1.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-6.1.1.tgz#dd8cdff0741a98bc89aeb85820302beb9bcc0bf4" + integrity sha512-rWLgTr5A44/XhvCQPYj0X9Tc+cjUaHofSM4lcwjc9MavD5lkjIhJ+h8JQlavPlTIgDpwhuRozaIykBvX9ItaSA== + dependencies: + node-fetch "~2.6.0" + file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -716,6 +921,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + find-up@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -776,6 +988,13 @@ get-url-origin@^1.0.1: resolved "https://registry.yarnpkg.com/get-url-origin/-/get-url-origin-1.0.1.tgz#edebfcc085433e84c6b32a5738b0996edfd5a7b9" integrity sha512-MMSKo16gB2+6CjWy55jNdIAqUEaKgw3LzZCb8wVVtFrhoQ78EXyuYXxDdn3COI3A4Xr4ZfM3fZa9RTjO6DOTxw== +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + glob@^7.1.3, glob@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -788,16 +1007,30 @@ glob@^7.1.3, glob@^7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -graceful-fs@^4.1.2: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== +globby@^10.0.1: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" -graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== +graceful-fs@^4.1.2: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -853,6 +1086,16 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== +ignore@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -951,6 +1194,11 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-file@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-file/-/is-file-1.0.0.tgz#28a44cfbd9d3db193045f22b65fce8edf9620596" @@ -968,11 +1216,23 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-glob@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + is-hexadecimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-plain-obj@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" @@ -1034,7 +1294,7 @@ joyo-kanji@^0.2.1: resolved "https://registry.yarnpkg.com/joyo-kanji/-/joyo-kanji-0.2.1.tgz#5e2e8ea2b903ba9333f1680c66902fc9682ea592" integrity sha1-Xi6OorkDupMz8WgMZpAvyWgupZI= -js-yaml@^3.12.0, js-yaml@^3.14.1, js-yaml@^3.8.2, js-yaml@^3.9.1: +js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.14.1, js-yaml@^3.8.2, js-yaml@^3.9.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -1212,6 +1472,11 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" +map-like@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/map-like/-/map-like-2.0.0.tgz#94496d49ad333c0dc3234b27adbbd1e8535953b4" + integrity sha1-lEltSa0zPA3DI0snrbvR6FNZU7Q= + markdown-table@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" @@ -1338,6 +1603,11 @@ mem@^4.3.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" +merge2@^1.2.3, merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + micromark-extension-footnote@^0.3.0: version "0.3.2" resolved "https://registry.yarnpkg.com/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz#129b74ef4920ce96719b2c06102ee7abb2b88a20" @@ -1405,6 +1675,14 @@ micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3: debug "^4.0.0" parse-entities "^2.0.0" +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + mimic-fn@^2.0.0, mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -1422,7 +1700,7 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@1.0.4: +mkdirp@1.0.4, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -1519,13 +1797,20 @@ nlcst-types@^1.2.4: dependencies: unist-types "^1.1.5" -node-fetch@^2.6.0: +node-fetch@^2.6.0, node-fetch@~2.6.0: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" +node-localstorage@^2.1.6: + version "2.2.1" + resolved "https://registry.yarnpkg.com/node-localstorage/-/node-localstorage-2.2.1.tgz#869723550a4883e426cb391d2df0b563a51c7c1c" + integrity sha512-vv8fJuOUCCvSPjDjBLlMqYMHob4aGjkmrkaE42/mZr0VT+ZAU10jRF8oTnX9+pgU9/vYJ8P7YT3Vd6ajkmzSCw== + dependencies: + write-file-atomic "^1.1.4" + normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -1738,6 +2023,16 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picomatch@^2.2.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -1775,7 +2070,7 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prh@^5.4.4: +prh@5.4.4, prh@^5.4.4: version "5.4.4" resolved "https://registry.yarnpkg.com/prh/-/prh-5.4.4.tgz#5b618213a187f3580f262f4e0f79e8e8561ea179" integrity sha512-UATF+R/2H8owxwPvF12Knihu9aYGTuZttGHrEEq5NBWz38mREh23+WvCVKX3fhnIZIMV7ye6E1fnqAl+V6WYEw== @@ -1796,6 +2091,11 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + quote@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01" @@ -1939,6 +2239,11 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -1946,6 +2251,13 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -1983,6 +2295,11 @@ sentence-splitter@^3.2.1: object_values "^0.1.2" structured-source "^3.0.2" +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + slice-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" @@ -1992,6 +2309,11 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +slide@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + snap-shot-compare@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/snap-shot-compare/-/snap-shot-compare-3.0.0.tgz#7c3a4d78193bee12e3c7c945a2a8ea81bb421b59" @@ -2237,6 +2559,14 @@ textlint-rule-helper@^2.0.0, textlint-rule-helper@^2.1.1, textlint-rule-helper@^ structured-source "^3.0.2" unist-util-visit "^1.1.0" +textlint-rule-helper@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/textlint-rule-helper/-/textlint-rule-helper-2.2.1.tgz#fe223d4a6c492b9aaf6e8a33fca5ad8a02e4e027" + integrity sha512-pdX3uNbFzQTgINamaBpEHRT/MgROHev5wCnQnUTXRLT5DaRjls0Rmpi5d1MPZG6HT5NKVL++Q2J0FUbh5shi3Q== + dependencies: + structured-source "^3.0.2" + unist-util-visit "^2.0.3" + textlint-rule-ja-hiragana-fukushi@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/textlint-rule-ja-hiragana-fukushi/-/textlint-rule-ja-hiragana-fukushi-1.3.0.tgz#fbc7af15788c5947eb9937c3647a42891864075c" @@ -2658,6 +2988,13 @@ textlint@^12.1.0: try-resolve "^1.0.1" unique-concat "^0.2.2" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" @@ -2797,6 +3134,15 @@ unist-util-visit@^1.1.0: dependencies: unist-util-visit-parents "^2.0.0" +unist-util-visit@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + unist-util-visit@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.0.0.tgz#a8e239038f7b29aadc649a6080f42bc85ea1a7bc" @@ -2833,6 +3179,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -2901,6 +3252,15 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write-file-atomic@^1.1.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" + integrity sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8= + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + slide "^1.1.5" + write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" From 75d077064556f1d9af4b125e783905698a0a7719 Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Wed, 23 Feb 2022 02:25:34 +0900 Subject: [PATCH 55/57] =?UTF-8?q?.textlintrc=E3=82=92sudden-death=E3=81=AB?= =?UTF-8?q?=E5=8F=8D=E6=98=A0=E3=81=95=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-copy-ci-hato-bot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-copy-ci-hato-bot.yml b/.github/workflows/pr-copy-ci-hato-bot.yml index 10cefaf177..f2794d5975 100644 --- a/.github/workflows/pr-copy-ci-hato-bot.yml +++ b/.github/workflows/pr-copy-ci-hato-bot.yml @@ -31,7 +31,7 @@ jobs: find hato-bot/${worklows_path} -type f \ -not -name "*hato-bot.yml" \ -exec cp {} "${DEST_PATH}" \; - for f in .markdown-lint.yml .python-lint .python-lint + for f in .markdown-lint.yml .python-lint .python-lint .textlintrc do cp hato-bot/.github/linters/${f} sudden-death/.github/linters/ done From 75934382c0d447c28ab798d8e3b3546b2c71f367 Mon Sep 17 00:00:00 2001 From: nakkaa Date: Wed, 23 Feb 2022 13:15:46 +0900 Subject: [PATCH 56/57] update release note for v2.2.3 --- CHANGELOG.md | 7 +++++++ slackbot_settings.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b477e6f01..dcf7326ab4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ * `Removed` 削除された機能について。 * `Fixed` バグ修正について。 +## v2.2.3 - 2022-02-23 + +### Changed + +* Python 3.9.10をサポート対象に変更しました。(#807) +* 使用するdockerイメージをalpineからbullseyeへ変更しました。(#832) + ## v2.2.2 - 2022-02-11 ### Changed diff --git a/slackbot_settings.py b/slackbot_settings.py index f81af940f6..f47e0d3a6b 100644 --- a/slackbot_settings.py +++ b/slackbot_settings.py @@ -36,4 +36,4 @@ GIT_COMMIT_HASH = os.environ.get('GIT_COMMIT_HASH') -VERSION = "2.2.2" +VERSION = "2.2.3" From ec9a6ba40cc15ede48779349a24d86ec5c6b619b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 04:16:41 +0000 Subject: [PATCH 57/57] =?UTF-8?q?=E9=B3=A9=E3=81=AF=E5=94=90=E6=8F=9A?= =?UTF-8?q?=E3=81=92=EF=BC=81(=E8=87=AA=E5=8B=95=E3=81=A7=E7=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=82=E3=81=92=E3=81=9F=E3=82=88=EF=BC=81?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a10933cb11..49eb3a7631 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ --- repos: - repo: https://github.com/zricethezav/gitleaks - rev: v8.2.7 + rev: v8.3.0 hooks: - id: gitleaks