Skip to content

Commit 437f77b

Browse files
authored
Merge pull request #151 from yosupo06/nobug
upgrade library versions
2 parents f669803 + 797b9f5 commit 437f77b

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

.github/workflows/expander.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest]
15-
python-version: [3.5, 3.6]
15+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v4
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222
- name: Set up pytest

.github/workflows/unittest_msvc.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ jobs:
1616
msvc: "Visual Studio 17 2022"
1717
- os: windows-2019
1818
msvc: "Visual Studio 16 2019"
19-
- os: windows-2016
20-
msvc: "Visual Studio 15 2017"
2119

2220
steps:
2321
- name: Setup MSBuild.exe
24-
uses: microsoft/setup-msbuild@v1.0.2
22+
uses: microsoft/setup-msbuild@v1.1
2523
- uses: actions/checkout@v2
2624
with:
2725
submodules: recursive

document_en/appendix.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ If you don't want to copy `atcoder` folder manually, do as follows.
2222

2323
### Visual Studio
2424

25-
Visual Studio 2017 / 2019 is supported. Update it if you are using old Visual Studio.
25+
Visual Studio 2019 / 2022 is supported. Update it if you are using old Visual Studio.
2626

2727
If Visual Studio is installed, there is a folder like the following.
2828

29+
- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include`
2930
- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include`
30-
- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include`
3131

3232
Copy `atcoder` folder into it, i.e., put it so that the path will be as follows.
3333

34-
- `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`
34+
- `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`
3535

3636
## How to Submit to Other Online Judge Systems
3737

document_ja/appendix.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222

2323
### Visual Studioへのインストール方法
2424

25-
古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2017 / 2019をサポートしています
25+
古いVisual Studioを使っている場合、アップデートしてください。Visual Studio 2019 / 2022をサポートしています
2626

2727
Visual Studioがインストールされているならば、以下のようなフォルダがあるはずです。
2828

29+
- `C:\Program Files\Microsoft Visual Studio\2022\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.35.32215)\include`
2930
- `C:\Program Files (x86)\Microsoft Visual Studio\2019\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.27.29110)\include`
30-
- `C:\Program Files (x86)\Microsoft Visual Studio\2017\(Community, Professional or Enterprise)\VC\Tools\MSVC\(Some number, e.g. 14.10.25017)\include`
3131

3232
このなかに丸ごと `atcoder` フォルダをコピーしてください。つまり、
3333

34-
- `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`
34+
- `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`
3535

3636
となるように配置してください。
3737

test/benchmark/benchmark

Submodule benchmark updated 144 files

test/unittest/googletest

Submodule googletest updated 288 files

tools/generate_document.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import markdown
1010
import toml
11-
from jinja2 import DictLoader, Environment, Template, escape
11+
from jinja2 import DictLoader, Environment, Template
12+
from markupsafe import escape
1213

1314
logger: Logger = getLogger(__name__)
1415

0 commit comments

Comments
 (0)