Fixes according to next release (#269)

* fix openvino year

* fix missing scipy for ubuntu20

Author: dkalinowski

templates/rhel8/install/copy.dockerfile.j2

@@ -13,7 +13,7 @@ WORKDIR ${TEMP_DIR}
 {% endif %}
 RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+')" && \
+    OV_YEAR="$(echo $OV_BUILD | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
     mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
     cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \

templates/ubuntu18/install/copy.dockerfile.j2

@@ -7,7 +7,7 @@ RUN useradd -ms /bin/bash -G users openvino
 
 RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+')" && \
+    OV_YEAR="$(echo $OV_BUILD | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
     mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
     cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \

templates/ubuntu20/install/copy.dockerfile.j2

@@ -7,7 +7,7 @@ RUN useradd -ms /bin/bash -G users openvino
 
 RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
     OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+')" && \
+    OV_YEAR="$(echo $OV_BUILD | grep -oP '^[^\d]*(\d+)')" && \
     OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
     mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
     cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \

tests/conftest.py

@@ -324,7 +324,7 @@ def install_omz_commands(request, bash, image_os, distribution, install_openvino
                              f'cd open_model_zoo && git checkout {omz_rev} && cd .. && '
                              'ln -s open_model_zoo/demos demos',
                              ),
-                        bash('python3 -m pip install --no-deps open_model_zoo/demos/common/python'),
+                        bash('python3 -m pip install open_model_zoo/demos/common/python'),
                         bash('open_model_zoo/demos/build_demos.sh || true')]
         else:
             commands = [bash('open_model_zoo/demos/build_demos.sh || true'),