Skip to content

Commit a728514

Browse files
committed
renamig
1 parent 40998ce commit a728514

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

docs/src/ch01_introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Therefore, all **cpp-dev** packages may also be used outside of **cpp-dev** as w
4545

4646
A workflow using **cpp-dev** could look like:
4747

48-
* **Initialize project**: `cpd init <new-project> [--std c++17] [--version <major.minor.patch>]`
48+
* **Initialize project**: `cpd init <new-project> [--std c++20] [--version <major.minor.patch>]`
4949
* **Add external dependency**: `cpd add-dep <dep>@<version>`
5050
* **Update external dependencies**: `cpd update-dep [<dep>@<version>]`
5151
* **Build**: `cpd build [release | debug]`

src/cpp_dev/common/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# Public API ###
1010
###############################################################################
1111

12-
CppStandard = Literal["c++11", "c++14", "c++17", "c++20", "c++23"]
12+
CppStandard = Literal["c++20"]

src/cpp_dev/dependency/conan/config/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ arch: [x86_64]
55
compiler:
66
gcc:
77
version: ["13"]
8-
cppstd: [None, 11, 14, 17, 20, 23]
8+
cppstd: [None, 20]
99
libcxx: [libstdc++, libstdc++11]
1010
clang:
1111
version: ["19"]
1212
libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
13-
cppstd: [None, 11, 14, 17, 20, 23]
13+
cppstd: [None, 20]
1414
build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel]

src/tests/cpp_dev/dependency/conan/test_command_wrapper.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ def patched_run_command_assert_success() -> Generator[MockType]:
3232

3333
def test_conan_create(patched_run_command_assert_success: MockType) -> None:
3434
# todo: this test currently uses a mock, but wil later be changed to test with a real server.
35-
conan_create(Path("package_dir"), "profile", {"compiler": "test", "compiler.cppstd": "c++17"})
35+
conan_create(Path("package_dir"), "profile", {"compiler": "test", "compiler.cppstd": "c++20"})
3636
patched_run_command_assert_success.assert_called_once_with(
3737
"conan",
3838
"create",
3939
"package_dir",
4040
"-pr:a", "profile",
4141
"-s:a", "compiler=test",
42-
"-s:a", "compiler.cppstd=c++17",
42+
"-s:a", "compiler.cppstd=c++20",
4343
)
4444

4545
def test_conan_upload(patched_run_command_assert_success: MockType) -> None:
@@ -61,22 +61,22 @@ def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[C
6161
ConanTestPackage(
6262
ref=ConanPackageReference("dep/1.0.0@official/cppdev"),
6363
dependencies=[],
64-
cpp_standard="c++17",
64+
cpp_standard="c++20",
6565
),
6666
ConanTestPackage(
6767
ref=ConanPackageReference("dep/2.0.0@official/cppdev"),
6868
dependencies=[],
69-
cpp_standard="c++17",
69+
cpp_standard="c++20",
7070
),
7171
ConanTestPackage(
7272
ref=ConanPackageReference("cpd/1.0.0@official/cppdev"),
7373
dependencies=[ConanPackageReference("dep/1.0.0@official/cppdev")],
74-
cpp_standard="c++17",
74+
cpp_standard="c++20",
7575
),
7676
ConanTestPackage(
7777
ref=ConanPackageReference("cpd1/1.0.0@official/cppdev"),
7878
dependencies=[ConanPackageReference("dep/2.0.0@official/cppdev")],
79-
cpp_standard="c++17",
79+
cpp_standard="c++20",
8080
),
8181
]
8282
with create_conan_test_env(tmp_path / "conan", server.http_port, TEST_PACKAGES) as conan_test_env:

src/tests/cpp_dev/dependency/conan/test_provider.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[C
2525
ConanTestPackage(
2626
ref=ConanPackageReference("dep/1.0.0@official/cppdev"),
2727
dependencies=[],
28-
cpp_standard="c++17",
28+
cpp_standard="c++20",
2929
),
3030
ConanTestPackage(
3131
ref=ConanPackageReference("cpd/1.0.0@official/cppdev"),
3232
dependencies=[],
33-
cpp_standard="c++17",
33+
cpp_standard="c++20",
3434
),
3535
ConanTestPackage(
3636
ref=ConanPackageReference("cpd/2.0.0@custom/cppdev"),
3737
dependencies=[],
38-
cpp_standard="c++17",
38+
cpp_standard="c++20",
3939
),
4040
ConanTestPackage(
4141
ref=ConanPackageReference("cpd/3.0.0@official/cppdev"),
4242
dependencies=[
4343
ConanPackageReference("dep/1.0.0@official/cppdev")
4444
],
45-
cpp_standard="c++17",
45+
cpp_standard="c++20",
4646
),
4747
]
4848
with create_conan_test_env(tmp_path, unused_http_port, TEST_PACKAGES) as conan_test_env:

src/tests/cpp_dev/dependency/conan/utils/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def _create_conan_source_config(conan_dir: Path, server_http_port: int) -> tuple
132132
))
133133

134134
COMPILER = "test"
135-
CPPSTD = "c++17"
135+
CPPSTD = "c++20"
136136
settings_path = source_config_path / "settings.yml"
137137
settings_path.write_text(dedent(
138138
f"""

src/tests/cpp_dev/dependency/conan/utils/test_env.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
ConanTestPackage(
1818
ref=ConanPackageReference("dep/1.0.0@official/cppdev"),
1919
dependencies=[],
20-
cpp_standard="c++17",
20+
cpp_standard="c++20",
2121
),
2222
ConanTestPackage(
2323
ref=ConanPackageReference("test/1.0.0@official/cppdev"),
2424
dependencies=[ConanPackageReference("dep/1.0.0@official/cppdev")],
25-
cpp_standard="c++17",
25+
cpp_standard="c++20",
2626
),
2727
]
2828

src/tests/cpp_dev/project/test_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def project_config() -> ProjectConfig:
2626
return ProjectConfig(
2727
name="test",
2828
version=SemanticVersion("0.1.0"),
29-
std="c++17",
29+
std="c++20",
3030
author="author",
3131
license="license",
3232
description="description",
@@ -90,7 +90,7 @@ def test_validate_dependencies_valid() -> None:
9090
valid_config = ProjectConfig(
9191
name="test",
9292
version=SemanticVersion("0.1.0"),
93-
std="c++17",
93+
std="c++20",
9494
author="author",
9595
license="license",
9696
description="description",
@@ -105,7 +105,7 @@ def test_validate_dependencies_invalid() -> None:
105105
invalid_config = ProjectConfig(
106106
name="test",
107107
version=SemanticVersion("0.1.0"),
108-
std="c++17",
108+
std="c++20",
109109
author="author",
110110
license="license",
111111
description="description",

src/tests/cpp_dev/project/test_core.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
def dep_provider() -> DependencyProvider:
2525
return ArtificialDependencyProvider(
2626
dependencies=[
27-
Dependency(id=DependencyIdentifier.from_str("official/llvm/1.0.0"), cpp_standard="c++17", deps=[]),
28-
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.0.0"), cpp_standard="c++17", deps=[]),
27+
Dependency(id=DependencyIdentifier.from_str("official/llvm/1.0.0"), cpp_standard="c++20", deps=[]),
28+
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.0.0"), cpp_standard="c++20", deps=[]),
2929
]
3030
)
3131

@@ -34,7 +34,7 @@ def test_setup_project(tmp_path: Path, dep_provider: DependencyProvider) -> None
3434
project_config = ProjectConfig(
3535
name="test_package",
3636
version=SemanticVersion("1.0.0"),
37-
std="c++17",
37+
std="c++20",
3838
author="author",
3939
license="license",
4040
description="description",

src/tests/cpp_dev/project/utils/test_artificial_dependency_provider.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
def test_available_versions() -> None:
1313
provider = ArtificialDependencyProvider(
1414
[
15-
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.0.0"), cpp_standard="c++17", deps=[]),
16-
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.10.0"), cpp_standard="c++17", deps=[]),
17-
Dependency(id=DependencyIdentifier.from_str("custom/gtest/1.11.0"), cpp_standard="c++17", deps=[]),
15+
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.0.0"), cpp_standard="c++20", deps=[]),
16+
Dependency(id=DependencyIdentifier.from_str("official/gtest/1.10.0"), cpp_standard="c++20", deps=[]),
17+
Dependency(id=DependencyIdentifier.from_str("custom/gtest/1.11.0"), cpp_standard="c++20", deps=[]),
1818
]
1919
)
2020
assert provider.fetch_versions("official", "gtest") == [

0 commit comments

Comments
 (0)