diff --git a/.github/workflows/expander.yml b/.github/workflows/expander.yml index 6faa0f7..1f7049c 100644 --- a/.github/workflows/expander.yml +++ b/.github/workflows/expander.yml @@ -12,11 +12,11 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.5, 3.6] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Set up pytest diff --git a/.github/workflows/unittest_msvc.yml b/.github/workflows/unittest_msvc.yml index 75a7522..896c7a6 100644 --- a/.github/workflows/unittest_msvc.yml +++ b/.github/workflows/unittest_msvc.yml @@ -16,12 +16,10 @@ jobs: msvc: "Visual Studio 17 2022" - os: windows-2019 msvc: "Visual Studio 16 2019" - - os: windows-2016 - msvc: "Visual Studio 15 2017" steps: - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - uses: actions/checkout@v2 with: submodules: recursive diff --git a/document_en/appendix.md b/document_en/appendix.md index 810fa33..f791ab3 100644 --- a/document_en/appendix.md +++ b/document_en/appendix.md @@ -22,16 +22,16 @@ If you don't want to copy `atcoder` folder manually, do as follows. ### Visual Studio -Visual Studio 2017 / 2019 is supported. Update it if you are using old Visual Studio. +Visual Studio 2019 / 2022 is supported. Update it if you are using old Visual Studio. If Visual Studio is installed, there is a folder like the following. +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include` - `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include` -- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include` Copy `atcoder` folder into it, i.e., put it so that the path will be as follows. -- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include\atcoder\dsu.hpp` +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder\dsu.hpp` ## How to Submit to Other Online Judge Systems diff --git a/document_ja/appendix.md b/document_ja/appendix.md index 37433ee..c21e983 100644 --- a/document_ja/appendix.md +++ b/document_ja/appendix.md @@ -22,16 +22,16 @@ ### Visual Studioへのインストール方法 -古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2017 / 2019をサポートしています。 +古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2019 / 2022をサポートしています。 Visual Studioがインストールされているならば、以下のようなフォルダがあるはずです。 +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include` - `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include` -- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include` このなかに丸ごと `atcoder` フォルダをコピーしてください。つまり、 -- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include\atcoder\dsu.hpp` +- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include\atcoder\dsu.hpp` となるように配置してください。 diff --git a/test/benchmark/benchmark b/test/benchmark/benchmark index 8df87f6..d572f47 160000 --- a/test/benchmark/benchmark +++ b/test/benchmark/benchmark @@ -1 +1 @@ -Subproject commit 8df87f6c879cbcabd17c5cfcec7b89687df36953 +Subproject commit d572f4777349d43653b21d6c2fc63020ab326db2 diff --git a/test/unittest/googletest b/test/unittest/googletest index 703bd9c..cead3d5 160000 --- a/test/unittest/googletest +++ b/test/unittest/googletest @@ -1 +1 @@ -Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e +Subproject commit cead3d57c93ff8c4e5c1bbae57a5c0b0b0f6e168 diff --git a/tools/generate_document.py b/tools/generate_document.py index 0158a33..d14d486 100755 --- a/tools/generate_document.py +++ b/tools/generate_document.py @@ -8,7 +8,8 @@ import markdown import toml -from jinja2 import DictLoader, Environment, Template, escape +from jinja2 import DictLoader, Environment, Template +from markupsafe import escape logger: Logger = getLogger(__name__)