tidy pyenv

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

Dockerfile

@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 COPY requirements.txt /tmp
 
 RUN  apt-get update \
-   && apt-get install -y vim yarn sudo \
+   && apt-get install -y vim yarn sudo python3-sphinx \
    && apt-get install -y make build-essential libssl-dev zlib1g-dev \ 
           libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \
           libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl git \
@@ -36,7 +36,7 @@ RUN /bin/bash -c " \
    && git clone https://github.com/momo-lab/xxenv-latest.git ~/.pyenv/plugins/latest \
    "
 
-RUN echo 'export PYENV_ROOT="~/.pyenv"' >> ~/.bashrc \
+RUN echo 'export PYENV_ROOT="/home/theia/.pyenv"' >> ~/.bashrc \
    && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
    && echo 'if command -v pyenv 1>/dev/null 2>&1; then eval "$(pyenv init -)"; fi' >> ~/.bashrc
 
@@ -53,25 +53,25 @@ RUN export PATH=/home/theia/.pyenv/bin:$PATH; \
    && pyenv local $(pyenv versions --bare) \
    && pyenv versions
 
+RUN echo "Installing python modules" \
+    && PY_PATHS=$(ls -1 /home/theia/.pyenv/versions/*/bin/python?.?) \
+    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade pip setuptools wheel; done \
+    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade tox tox-pyenv ipython pylint pytest mock nose flake8 flake8-docstrings autopep8; done \
+    && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done 
 
 USER root
 
 RUN echo "Installing python modules" \
-    && PY_PATHS=$(ls -1 /home/theia/.pyenv/versions/*/bin/python?.? && cat /home/theia/python3_path && cat /home/theia/python2_path) \
+    && PY_PATHS=$(cat /home/theia/python3_path && cat /home/theia/python2_path) \
     && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade pip setuptools wheel; done \
     && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade tox tox-pyenv ipython pylint pytest mock nose flake8 flake8-docstrings autopep8; done \
-    && /home/theia/.pyenv/versions/*/bin/python3.8 -m pip install -U black isort sphinx \
+    && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done \
+    && /home/theia/.pyenv/versions/*/bin/python3.8 -m pip install -U black isort \
     && ln -f -s /home/theia/.pyenv/versions/*/bin/black /bin/ \
-    && ln -f -s /home/theia/.pyenv/versions/*/bin/isort /bin/ \
-    && ln -f -s /home/theia/.pyenv/versions/*/bin/sphinx /bin/ \
-    && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done 
-
-RUN chown -R theia:theia /home/theia 
+    && ln -f -s /home/theia/.pyenv/versions/*/bin/isort /bin/ 
 
 USER theia
 WORKDIR /home/theia
 
-#RUN echo 'PATH=$PATH:/home/theia/.local/bin/' >> /home/theia/.bashrc
-
 ENV PYTHONPATH=/home/project:$PYTHONPATH
 

pre_push_verifications.sh

@@ -9,9 +9,14 @@ black bin/ tests/ hpecp/
 flake8 --docstring-convention numpy bin/ hpecp/
 flake8 --ignore=D,E501 tests/ # verify tests, but not for documentation
 
+if [[  -d /home/theia/ ]]; 
+then
+    # ensure pyenvs are available to tox
+    eval "$(pyenv init -)"
+    pyenv shell $(pyenv versions --bare)
+fi
+
 tox -- tests/
 
 # coverage causes some tests to fail on PY3 so test it (issues 93)
-#coverage3 erase && coverage3 run --source hpecp,bin setup.py test && coverage3 report -m
-
-
+#coverage3 erase && coverage3 run --source hpecp,bin setup.py test && coverage3 report -m