Skip to content

Commit

Permalink
Merge pull request #982 from seriva/0.5.3-reverse-merge-5
Browse files Browse the repository at this point in the history
- Fixed pip install order for devcontainer
- Fix for properly removing wheel generation directories.
  • Loading branch information
seriva authored Mar 9, 2020
2 parents f5aae18 + 3faf2cf commit 0b76dbe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions core/src/epicli/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \

Expand Down
6 changes: 3 additions & 3 deletions core/src/epicli/prepare-bds.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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\
6 changes: 3 additions & 3 deletions core/src/epicli/prepare-bds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/

0 comments on commit 0b76dbe

Please sign in to comment.