Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker, python, libs #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update docker, python, libs #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Automatic differentiation deep neural network framework.

## Getting Started

python >= 3.5.
python >= 3.8.

### Installing

Expand Down
10 changes: 5 additions & 5 deletions develop.requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-r test.requirements.txt

# docs
Sphinx==1.6.1
sphinx-rtd-theme==0.2.4
recommonmark==0.4.0
Sphinx==4.4.0
sphinx-rtd-theme==1.0.0
recommonmark==0.7.1

# development
Pillow==4.1.1
colorlog==2.10.0
ipdb==0.10.3
colorlog==6.6.0
ipdb==0.13.9
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:xenial
FROM buildpack-deps:focal

MAINTAINER [email protected]

Expand Down
18 changes: 4 additions & 14 deletions dockerfiles/development.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
FROM buildpack-deps:xenial
FROM buildpack-deps:focal

MAINTAINER [email protected]

RUN echo "deb http://ftp.jaist.ac.jp/ubuntu/ xenial main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial main restricted universe multiverse \n\
deb http://ftp.jaist.ac.jp/ubuntu/ xenial-updates main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial-updates main restricted universe multiverse \n\
deb http://ftp.jaist.ac.jp/ubuntu/ xenial-backports main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial-backports main restricted universe multiverse \n\
deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse \n\
deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" > /etc/apt/sources.list

RUN apt-get update && apt-get install -y \
python3 \
python3-dev \
Expand All @@ -22,9 +13,8 @@ RUN apt-get update && apt-get install -y \

# alias python=python3
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN ln -s /usr/bin/pip3 /usr/bin/pip

RUN pip install -U pip setuptools
RUN pip3 install -U pip setuptools

# develop
RUN apt-get update && apt-get install -y \
Expand All @@ -35,8 +25,8 @@ RUN apt-get update && apt-get install -y \

COPY test.requirements.txt /tmp/test.requirements.txt
COPY develop.requirements.txt /tmp/develop.requirements.txt
RUN pip install -r /tmp/develop.requirements.txt
RUN pip3 install -r /tmp/develop.requirements.txt

COPY ./ /home
WORKDIR /home
RUN pip install -e .
RUN pip3 install -e .
18 changes: 4 additions & 14 deletions dockerfiles/test.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
FROM buildpack-deps:xenial
FROM buildpack-deps:focal

MAINTAINER [email protected]

RUN echo "deb http://ftp.jaist.ac.jp/ubuntu/ xenial main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial main restricted universe multiverse \n\
deb http://ftp.jaist.ac.jp/ubuntu/ xenial-updates main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial-updates main restricted universe multiverse \n\
deb http://ftp.jaist.ac.jp/ubuntu/ xenial-backports main restricted universe multiverse \n\
deb-src http://ftp.jaist.ac.jp/ubuntu/ xenial-backports main restricted universe multiverse \n\
deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse \n\
deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse" > /etc/apt/sources.list

RUN apt-get update && apt-get install -y \
python3 \
python3-dev \
Expand All @@ -23,14 +14,13 @@ RUN apt-get update && apt-get install -y \

ENV PYENV_ROOT $HOME/.pyenv
ENV PATH $HOME/.pyenv/shims:$HOME/.pyenv/bin:$PATH
ENV PYTHON_VERSIONS 3.5.2 3.6.1
ENV PYTHON_VERSIONS 3.9.10 3.10.2

# alias python=python3
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
RUN ln -s /usr/bin/pip3 /usr/bin/pip

RUN pip install -U pip setuptools
RUN pip install tox
RUN pip3 install -U pip setuptools
RUN pip3 install tox

# pyenv
RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
Expand Down
11 changes: 6 additions & 5 deletions test.requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# test
tensorflow==1.1.0
pytest==3.0.7
pytest-cov==2.5.1
flake8==3.3.0
tox==2.7.0
# TODO: decide tf version & update test.
# tensorflow
pytest==7.0.1
pytest-cov==3.0.0
flake8==4.0.1
tox==3.24.5
codecov
codeclimate-test-reporter
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = flake8,py35,py36
envlist = flake8,py38,py39,py310

[testenv]
deps = -rtest.requirements.txt
Expand Down