Merge pull request hitachienergy#981 from seriva/fix/bds-script-fix

- Fixed pip install order for devcontainer
- Fix for properly removing wheel generation directories.

core/src/epicli/.devcontainer/Dockerfile

@@ -23,10 +23,10 @@ RUN chmod +x /config-pre.sh \
 
     && gem install serverspec rake rspec_junit_formatter \
 
-    && pip --disable-pip-version-check --no-cache-dir install pylint pytest wheel setuptools twine --default-timeout=100 \
-
     && pip --disable-pip-version-check --no-cache-dir install -r /requirements.txt --default-timeout=100 \
 
+    && pip --disable-pip-version-check --no-cache-dir install pylint pytest wheel setuptools twine --default-timeout=100 \
+
     && groupadd --gid $USER_GID $USERNAME \
     && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
 

core/src/epicli/prepare-bds.bat

@@ -6,6 +6,6 @@ set /p EPICLI_VERSION=<cli/version.txt.py
 pip download --no-clean --no-binary all -d %cd%/external/packages/ --build %cd%/external/ %cd%/dist/epicli-%EPICLI_VERSION%-py3-none-any.whl
 rmdir /Q /S %cd%\external\packages\
 rmdir /Q /S %cd%\external\epicli\
-rmdir /Q /S %cd%\external\build\
-rmdir /Q /S %cd%\external\dist\
-rmdir /Q /S %cd%\external\epicli.egg-info\
+rmdir /Q /S %cd%\build\
+rmdir /Q /S %cd%\dist\
+rmdir /Q /S %cd%\epicli.egg-info\

core/src/epicli/prepare-bds.sh

@@ -6,6 +6,6 @@ read EPICLI_VERSION < cli/version.txt.py
 pip download --no-clean --no-binary all -d $PWD/external/packages/ --build $PWD/external/ $PWD/dist/epicli-$EPICLI_VERSION-py3-none-any.whl
 rm -rf $PWD/external/packages/
 rm -rf $PWD/external/epicli/
-rm -rf $PWD/external/build/
-rm -rf $PWD/external/dist/
-rm -rf $PWD/external/epicli.egg-info/
+rm -rf $PWD/build/
+rm -rf $PWD/dist/
+rm -rf $PWD/epicli.egg-info/