Skip to content
Snippets Groups Projects
Commit c9326b03 authored by Marek Chrastina's avatar Marek Chrastina
Browse files

Merge branch 'dev' into 'master'

Update CI

See merge request !8
parents eb6f480c c61fc509
No related branches found
No related tags found
1 merge request!8Update CI
Pipeline #13013 passed
...@@ -51,10 +51,8 @@ build: ...@@ -51,10 +51,8 @@ build:
python safety: python safety:
stage: check stage: check
image: it4innovations/docker-pycheck:latest image: it4innovations/docker-pycheck:latest
before_script:
- virtualenv .venv
script: script:
- source .venv/bin/activate - source /opt/.venv/bin/activate
- pip install --upgrade pip setuptools - pip install --upgrade pip setuptools
- pip install dist/pipdeps*tar.gz - pip install dist/pipdeps*tar.gz
- pip list - pip list
...@@ -62,14 +60,11 @@ python safety: ...@@ -62,14 +60,11 @@ python safety:
install test: install test:
stage: check stage: check
image: it4innovations/docker-pypi:latest image: it4innovations/docker-pycheck:latest
before_script:
- virtualenv .venv
script: script:
- source .venv/bin/activate - source /opt/.venv/bin/activate
- pip install --upgrade pip setuptools - pip install --upgrade pip setuptools
- pip install dist/pipdeps*tar.gz - pip install dist/pipdeps*tar.gz
- pip list
- pipdeps --list || true - pipdeps --list || true
- pipdeps --table || true - pipdeps --table || true
- pipdeps --upgrade - pipdeps --upgrade
......
...@@ -26,6 +26,7 @@ import pip._internal.utils.misc ...@@ -26,6 +26,7 @@ import pip._internal.utils.misc
# https://www.python.org/dev/peps/pep-0508/#environment-markers # https://www.python.org/dev/peps/pep-0508/#environment-markers
PY_VER = ".".join(map(str, sys.version_info[:2])) PY_VER = ".".join(map(str, sys.version_info[:2]))
SYS_PLAT = sys.platform SYS_PLAT = sys.platform
PLAT_SYS = platform.system()
PLAT_PY_IMPL = platform.python_implementation() PLAT_PY_IMPL = platform.python_implementation()
SBoarder = collections.namedtuple("SBoarder", ["boarders", "extrem", "extrem_op"]) SBoarder = collections.namedtuple("SBoarder", ["boarders", "extrem", "extrem_op"])
...@@ -140,6 +141,7 @@ def is_in_conditions(condition): ...@@ -140,6 +141,7 @@ def is_in_conditions(condition):
return eval( return eval(
condition.replace("sys_platform", '"%s"' % SYS_PLAT) \ condition.replace("sys_platform", '"%s"' % SYS_PLAT) \
.replace("python_version", '"%s"' % PY_VER) \ .replace("python_version", '"%s"' % PY_VER) \
.replace("platform_system", '"%s"' % PLAT_SYS) \
.replace("platform_python_implementation", '"%s"' % PLAT_PY_IMPL)) .replace("platform_python_implementation", '"%s"' % PLAT_PY_IMPL))
def is_in_extra(extra, req_extra): def is_in_extra(extra, req_extra):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment