Unverified Commit 97ec4064 authored by Sébastien Eustace's avatar Sébastien Eustace
Browse files

Fix python restricted dependencies not being checked against virtualenv

parent 0ac244fa

CHANGELOG.md

+2 −1
Changes for CHANGELOG.md: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 


### Fixed



- Fixed handking of post releases.

- Fixed handling of post releases.

- Fixed python restricted dependencies not being checked agaisnt virtualenv version.





## [0.4.2] - 2018-03-10

poetry/installation/installer.py

+1 −1
Changes for poetry/installation/installer.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ class Installer: 
                continue



            parser = VersionParser()

            python = '.'.join([str(i) for i in sys.version_info[:3]])

            python = '.'.join([str(i) for i in self._io.venv.version_info[:3]])

            if 'python' in package.requirements:

                python_constraint = parser.parse_constraints(

                    package.requirements['python']

poetry/utils/venv.py

+16 −0
Changes for poetry/utils/venv.py: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ class Venv: 


    def __init__(self, venv=None):

        self._venv = venv

        self._version_info = None



    @classmethod

    def create(cls) -> 'Venv':
@@ -89,6 +90,21 @@ class Venv: 
        """

        return self._bin('pip')



    @property

    def version_info(self):

        if self._version_info is not None:

            return self._version_info



        if not self.is_venv():

            self._version_info = sys.version_info

        else:

            output = self.run('python', '--version')



            version = output.split(' ')

            self._version_info = version[1].strip().split('.')



        return self._version_info



    def run(self, bin: str, *args, **kwargs) -> str:

        """

        Run a command inside the virtual env.