Skip to content

Commit 2a80487

Browse files
grievejiafacebook-github-bot
authored andcommitted
Expand relative paths for --source-directory cli argument
Reviewed By: dkgi Differential Revision: D30521928 fbshipit-source-id: 3e5a7bb4575b2fe7cab1939b27cfd70e61c351cf
1 parent 0903cad commit 2a80487

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

client/configuration.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ def create_configuration(
12541254

12551255
command_argument_configuration = PartialConfiguration.from_command_arguments(
12561256
arguments
1257-
)
1257+
).expand_relative_paths(str(Path.cwd()))
12581258
if found_root is None:
12591259
project_root = Path.cwd()
12601260
relative_local_root = None
@@ -1275,7 +1275,8 @@ def create_configuration(
12751275
).expand_relative_paths(str(local_root)),
12761276
)
12771277
partial_configuration = merge_partial_configurations(
1278-
base=partial_configuration, override=command_argument_configuration
1278+
base=partial_configuration,
1279+
override=command_argument_configuration,
12791280
)
12801281

12811282
configuration = Configuration.from_partial_configuration(

client/tests/configuration_test.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,10 @@ def test_create_from_command_arguments_only(self) -> None:
11791179
self.assertEqual(configuration.project_root, str(root_path))
11801180
self.assertEqual(configuration.relative_local_root, None)
11811181
self.assertEqual(configuration.dot_pyre_directory, root_path / ".pyre")
1182+
self.assertListEqual(
1183+
list(configuration.source_directories or []),
1184+
[SimpleSearchPathElement(str(root_path))],
1185+
)
11821186

11831187
def test_create_from_global_configuration(self) -> None:
11841188
with tempfile.TemporaryDirectory() as root:
@@ -1198,6 +1202,10 @@ def test_create_from_global_configuration(self) -> None:
11981202
self.assertEqual(configuration.relative_local_root, None)
11991203
self.assertEqual(configuration.dot_pyre_directory, Path(".pyre"))
12001204
self.assertEqual(configuration.strict, True)
1205+
self.assertListEqual(
1206+
list(configuration.source_directories or []),
1207+
[SimpleSearchPathElement(str(root_path))],
1208+
)
12011209

12021210
def test_create_from_local_configuration(self) -> None:
12031211
with tempfile.TemporaryDirectory() as root:
@@ -1225,6 +1233,10 @@ def test_create_from_local_configuration(self) -> None:
12251233
self.assertEqual(configuration.relative_local_root, "local")
12261234
self.assertEqual(configuration.dot_pyre_directory, Path(".pyre"))
12271235
self.assertEqual(configuration.strict, True)
1236+
self.assertListEqual(
1237+
list(configuration.source_directories or []),
1238+
[SimpleSearchPathElement(str(root_path))],
1239+
)
12281240
self.assertListEqual(
12291241
list(configuration.search_path),
12301242
[

0 commit comments

Comments
 (0)