Skip to content

Commit

Permalink
rc6
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmeunier79 committed Mar 20, 2024
1 parent 3489d65 commit 6cfabc2
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
23 changes: 20 additions & 3 deletions Dockerfile_macapype_env_nomcr
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ ENV PATH=/opt/niftyreg/bin:$PATH

####################### new: python 3.10

RUN apt-get install -y -q wget build-essential libncursesw5-dev libssl-dev \
libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev

RUN wget https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tgz
RUN tar xzf Python-3.10.8.tgz
#RUN cd Python-3.10.8
Expand All @@ -189,18 +192,32 @@ RUN echo $(which python3.10)

RUN echo $(python3.10 -V )

RUN echo ""
RUN echo $(which pip3.10)
RUN echo $(pip3.10 -V )

RUN echo $(which pip3.10)
RUN echo $(pip3.10 -V )

RUN echo $(which python) && \
echo $(which python3.10) && \
RUN echo $(which python3.10) && \
ln -s /usr/local/bin/python3.10 /usr/bin/python && \
ln -s /usr/local/bin/pip3.10 /usr/bin/pip
ln -s /usr/local/bin/pip3.10 /usr/local/bin/pip3 && \
ln -s /usr/local/bin/pip3 /usr/local/bin/pip && \
ln -s /usr/local/bin/pip /usr/bin/pip

RUN echo $(python -m ssl)

RUN echo $(which python)
RUN echo $(python -V )

RUN echo $(which pip)

# specific problems with pillow
RUN apt-get install -y python3-pil python3-pil.imagetk

RUN python -m pip install -U pillow
#RUN pip install -U pillow
RUN python -c "import PIL; print(PIL.__version__)"

################################################## Finishing
RUN apt-get clean \
Expand Down
16 changes: 7 additions & 9 deletions Dockerfile_testpypi_nomcr
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Timestamp: 2020/12/02 18:33:44 UTC

FROM macatools/macapype_env:v0.2
FROM macatools/macapype_env:v0.2.2

USER root

Expand All @@ -20,13 +20,7 @@ MAINTAINER David Meunier "[email protected]"

RUN apt-get update && apt-get install -y git libpng-dev libfreetype6-dev libxft-dev libblas-dev liblapack-dev libatlas-base-dev gfortran libxml2-dev libxslt1-dev wget graphviz

RUN apt-get install -y python3-pil python3-pil.imagetk

RUN python -m pip install -U pillow
#RUN pip3 install pillow

#RUN apt-get install libx11-6 libxext6 libxt6 # matlab
RUN pip install xvfbwrapper \
RUN python -m pip install xvfbwrapper \
psutil \
numpy \
scipy \
Expand Down Expand Up @@ -55,7 +49,11 @@ RUN pip install xvfbwrapper \

############################################# install macapype

RUN pip install --no-deps --index-url https://test.pypi.org/simple/ --pre macapype && python -c "import macapype; print(macapype.__version__)"
#RUN pip3 install --no-deps --index-url https://test.pypi.org/simple/ --pre macapype
#RUN python3 -c "import macapype; print(macapype.__version__)"

RUN python -m pip install --no-deps --index-url https://test.pypi.org/simple/ --pre macapype
RUN python -c "import macapype; print(macapype.__version__)"

################################################## Finishing
RUN apt-get clean \
Expand Down
2 changes: 1 addition & 1 deletion macapype/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.3.5.2-rc5'
__version__ = '0.3.5.2-rc6'

0 comments on commit 6cfabc2

Please sign in to comment.