Fix build scripts

make-linux-release.sh

@@ -5,7 +5,7 @@ cd /io
 /opt/python/cp37-cp37m/bin/pip install poetry -U
 /opt/python/cp37-cp37m/bin/pip install poetry -U
 /opt/python/cp37-cp37m/bin/poetry config settings.virtualenvs.create false
 /opt/python/cp37-cp37m/bin/poetry config settings.virtualenvs.create false
 /opt/python/cp37-cp37m/bin/poetry install --no-dev
 /opt/python/cp37-cp37m/bin/poetry install --no-dev
-/opt/python/cp37-cp37m/bin/python sonnet make release \
+/opt/python/cp37-cp37m/bin/python sonnet make release --ansi \
     -P "2.7:/opt/python/cp27-cp27m/bin/python" \
     -P "2.7:/opt/python/cp27-cp27m/bin/python" \
     -P "3.4:/opt/python/cp34-cp34m/bin/python" \
     -P "3.4:/opt/python/cp34-cp34m/bin/python" \
     -P "3.5:/opt/python/cp35-cp35m/bin/python" \
     -P "3.5:/opt/python/cp35-cp35m/bin/python" \

sonnet

@@ -51,6 +51,11 @@ class MakeReleaseCommand(Command):
         from poetry.repositories.pool import Pool
         from poetry.repositories.pool import Pool
         from poetry.repositories.repository import Repository
         from poetry.repositories.repository import Repository
         from poetry.utils._compat import Path
         from poetry.utils._compat import Path
+        from poetry.utils._compat import decode
+        from poetry.utils._compat import encode
+        from poetry.utils._compat import subprocess
+        from poetry.utils.env import GET_BASE_PREFIX
+        from poetry.utils.env import VirtualEnv
         from poetry.utils.helpers import temporary_directory
         from poetry.utils.helpers import temporary_directory
         from poetry.vcs import get_vcs
         from poetry.vcs import get_vcs
 
 
@@ -92,12 +97,29 @@ class MakeReleaseCommand(Command):
                         version
                         version
                     )
                     )
                 )
                 )
-                with package.with_python_versions("^{}".format(version)):
+                prefix = decode(
+                    subprocess.run(
+                        [python],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.STDOUT,
+                        input=encode(GET_BASE_PREFIX),
+                        check=True,
+                        shell=WINDOWS,
+                    ).stdout
+                )
+                env = VirtualEnv(Path(prefix.strip()), base=Path(prefix.strip()))
+                with package.with_python_versions("~{}".format(version)):
                     solver = Solver(package, pool, Repository(), Repository(), self.io)
                     solver = Solver(package, pool, Repository(), Repository(), self.io)
                     ops = solver.solve()
                     ops = solver.solve()
+                    for op in ops:
+                        if not env.is_valid_for_marker(op.package.marker):
+                            op.skip("Not needed for the current environment")
 
 
                 self.vendorize_for_python(
                 self.vendorize_for_python(
-                    python, [op.package for op in ops], poetry_dir, version
+                    python,
+                    [op.package for op in ops if not op.skipped],
+                    poetry_dir,
+                    version,
                 )
                 )
                 vendor_dir = Path(
                 vendor_dir = Path(
                     os.path.join(poetry_dir, "_vendor", "py{}".format(python))
                     os.path.join(poetry_dir, "_vendor", "py{}".format(python))