Merge pull request #64 from sebix/dev-fix-markers

Remove hardcoded markers

py2pack/requires.py

@@ -17,6 +17,7 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
+import sys
 
 import pkg_resources
 from six.moves import filter
@@ -26,9 +27,7 @@
 def _requirement_filter_by_marker(req):
     """check if the requirement is satisfied by the marker"""
     if hasattr(req, 'marker') and req.marker:
-        # TODO (toabctl): currently we hardcode python 2.7 and linux2
-        # see https://www.python.org/dev/peps/pep-0508/#environment-markers
-        marker_env = {'python_version': '2.7', 'sys_platform': 'linux'}
+        marker_env = {'python_version': '.'.join(map(str, sys.version_info[:2])), 'sys_platform': sys.platform}
         if not req.marker.evaluate(environment=marker_env):
             return False
     return True

test/test_requires.py

@@ -18,6 +18,7 @@
 import os
 import pkg_resources
 import shutil
+import sys
 import tempfile
 import unittest
 from ddt import ddt, data, unpack
@@ -43,8 +44,8 @@ def _write_setup_py(self, content):
     @data(
         ("pywin32>=1.0;sys_platform=='win32'  # PSF", False),
         ("foobar", True),
-        ("foobar;python_version=='2.7'", True),
-        ("foobar;python_version=='3.5'", False),
+        ("foobar;python_version=='2.7'", sys.version_info[:2] == (2, 7)),
+        ("foobar;python_version=='3.5'", sys.version_info[:2] == (3, 5)),
     )
     @unpack
     def test__requirement_filter_by_marker(self, req, expected):