Merge branch 'dev' into 'master'

Update CI

See merge request !8

.gitlab-ci.yml

@@ -51,10 +51,8 @@ build:
 python safety:
   stage: check
   image: it4innovations/docker-pycheck:latest
-  before_script:
-    - virtualenv .venv
   script:
-    - source .venv/bin/activate
+    - source /opt/.venv/bin/activate
     - pip install --upgrade pip setuptools
     - pip install dist/pipdeps*tar.gz
     - pip list
@@ -62,14 +60,11 @@ python safety:
 
 install test:
   stage: check
-  image: it4innovations/docker-pypi:latest
-  before_script:
-    - virtualenv .venv
+  image: it4innovations/docker-pycheck:latest
   script:
-    - source .venv/bin/activate
+    - source /opt/.venv/bin/activate
     - pip install --upgrade pip setuptools
     - pip install dist/pipdeps*tar.gz
-    - pip list
     - pipdeps --list || true
     - pipdeps --table || true
     - pipdeps --upgrade

pipdeps/pipdeps.py

@@ -26,6 +26,7 @@ import pip._internal.utils.misc
 # https://www.python.org/dev/peps/pep-0508/#environment-markers
 PY_VER = ".".join(map(str, sys.version_info[:2]))
 SYS_PLAT = sys.platform
+PLAT_SYS = platform.system()
 PLAT_PY_IMPL = platform.python_implementation()
 
 SBoarder = collections.namedtuple("SBoarder", ["boarders", "extrem", "extrem_op"])
@@ -140,6 +141,7 @@ def is_in_conditions(condition):
     return eval(
         condition.replace("sys_platform", '"%s"' % SYS_PLAT) \
                  .replace("python_version", '"%s"' % PY_VER) \
+                 .replace("platform_system", '"%s"' % PLAT_SYS) \
                  .replace("platform_python_implementation", '"%s"' % PLAT_PY_IMPL))
 
 def is_in_extra(extra, req_extra):