Skip to content

Commit

Permalink
Add space before the semicolon separating the package and the platfor…
Browse files Browse the repository at this point in the history
…m constraints

Fixes python-poetry#12

Related to:

- python-poetry/poetry#4575
- pypa/packaging#456
  • Loading branch information
pmav99 committed Sep 30, 2021
1 parent 2b82c6e commit 342fe43
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/poetry_export_plugin/exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _export_requirements_txt(self, cwd: Path, output: Union["IO", str]) -> None:
if ";" in requirement:
markers = requirement.split(";", 1)[1].strip()
if markers:
line += f"; {markers}"
line += f" ; {markers}"

if (
not is_direct_remote_reference
Expand Down
18 changes: 9 additions & 9 deletions tests/test_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ def test_exporter_can_export_requirements_txt_with_standard_packages_and_markers

expected = """\
bar==4.5.6
baz==7.8.9; sys_platform == "win32"
foo==1.2.3; python_version < "3.7"
baz==7.8.9 ; sys_platform == "win32"
foo==1.2.3 ; python_version < "3.7"
"""

assert expected == content
Expand Down Expand Up @@ -431,15 +431,15 @@ def test_exporter_can_export_requirements_txt_with_nested_packages_and_markers(
content = f.read()

expected = {
"a": Dependency.create_from_pep_508("a==1.2.3; python_version < '3.7'"),
"a": Dependency.create_from_pep_508("a==1.2.3 ; python_version < '3.7'"),
"b": Dependency.create_from_pep_508(
"b==4.5.6; platform_system == 'Windows' and python_version < '3.7'"
"b==4.5.6 ; platform_system == 'Windows' and python_version < '3.7'"
),
"c": Dependency.create_from_pep_508(
"c==7.8.9; sys_platform == 'win32' and python_version < '3.7'"
"c==7.8.9 ; sys_platform == 'win32' and python_version < '3.7'"
),
"d": Dependency.create_from_pep_508(
"d==0.0.1; platform_system == 'Windows' and python_version < '3.7' or sys_platform == 'win32' and python_version < '3.7'"
"d==0.0.1 ; platform_system == 'Windows' and python_version < '3.7' or sys_platform == 'win32' and python_version < '3.7'"
),
}

Expand All @@ -455,7 +455,7 @@ def test_exporter_can_export_requirements_txt_with_nested_packages_and_markers(

@pytest.mark.parametrize(
"dev,lines",
[(False, ['a==1.2.3; python_version < "3.8"']), (True, ["a==1.2.3", "b==4.5.6"])],
[(False, ['a==1.2.3 ; python_version < "3.8"']), (True, ["a==1.2.3", "b==4.5.6"])],
)
def test_exporter_can_export_requirements_txt_with_nested_packages_and_markers_any(
tmp_dir, poetry, dev, lines
Expand Down Expand Up @@ -1180,7 +1180,7 @@ def test_exporter_can_export_requirements_txt_with_directory_packages_and_marker
content = f.read()

expected = """\
foo @ {}/tests/fixtures/sample_project; python_version < "3.7"
foo @ {}/tests/fixtures/sample_project ; python_version < "3.7"
""".format(
working_directory.as_uri()
)
Expand Down Expand Up @@ -1269,7 +1269,7 @@ def test_exporter_can_export_requirements_txt_with_file_packages_and_markers(
content = f.read()

expected = """\
foo @ {}/tests/fixtures/distributions/demo-0.1.0.tar.gz; python_version < "3.7"
foo @ {}/tests/fixtures/distributions/demo-0.1.0.tar.gz ; python_version < "3.7"
""".format(
working_directory.as_uri()
)
Expand Down

0 comments on commit 342fe43

Please sign in to comment.