Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.

Fix issue with setup requirements not being installed #289

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions integrationtests/serpy/requirements_override.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ pkgs, python }:

self: super: {

}
17 changes: 17 additions & 0 deletions integrationtests/test_serpy_0_1_1.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from unittest import TestCase

from .framework import IntegrationTest


class SerpyTest(IntegrationTest, TestCase):
def name_of_testcase(self):
return "serpy"

def python_version(self):
return "3"

def requirements(self):
return ["serpy==0.1.1"]

def setup_requires(self):
return ["six==1.12.0"]
11 changes: 11 additions & 0 deletions src/pypi2nix/stage1.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,19 @@ def build(
requirements: RequirementSet,
setup_requirements: Optional[RequirementSet] = None,
) -> List[str]:
self.ensure_download_directory_exists()
if setup_requirements is None:
self.logger.info("No setup requirements detected")
setup_requirements = RequirementSet(self.pip.target_platform)
else:
self.logger.info("Instal setup requirements")
setup_requirements = (
self.detect_additional_build_dependencies(setup_requirements)
+ setup_requirements
)
self.pip.install(
setup_requirements, source_directories=[self.download_directory]
)
requirements = requirements + setup_requirements
detected_requirements = self.detect_additional_build_dependencies(requirements)
updated_requirements = detected_requirements + requirements
Expand Down