From 7546b05191d62c7acc16ca0d1db3b73f5d2a0008 Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 11 Feb 2019 12:01:35 -0800 Subject: [PATCH] Docs update --- .dockerignore | 1 - docs/builder/Dockerfile | 13 +++++++------ docs/builder/build-docs.sh | 2 +- docs/builder/build.sh | 1 + docs/changelog.rst | 11 ++++++++++- requirements-test.txt | 2 ++ requirements.txt | 1 + 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index dc83833..c967012 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ /testenv/* /share/* -/docs/* /build/* /dist/* /*.egg-info diff --git a/docs/builder/Dockerfile b/docs/builder/Dockerfile index 0892037..df8292d 100644 --- a/docs/builder/Dockerfile +++ b/docs/builder/Dockerfile @@ -1,13 +1,14 @@ -FROM ubuntu:artful +FROM ubuntu:bionic -ADD ./ /tmp/pyircbot/ - -RUN apt-get update ; \ +RUN apt-get update && \ + export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y python3 python3-sphinx python3-setuptools python3-dev python3-pip make wget unzip git -RUN cd /tmp/pyircbot/ && pip3 install -r requirements.txt +COPY ./docs/builder/start /start -COPY docs/builder/start /start +COPY ./ /tmp/pyircbot/ + +RUN cd /tmp/pyircbot/ && pip3 install -r requirements-test.txt RUN chmod +x /start ; \ mkdir /tmp/docs diff --git a/docs/builder/build-docs.sh b/docs/builder/build-docs.sh index b28cd8e..58a9107 100755 --- a/docs/builder/build-docs.sh +++ b/docs/builder/build-docs.sh @@ -1,4 +1,4 @@ #!/bin/sh -ex -sudo docker run -it --rm -v $PWD/:/tmp/pyircbot/ pybdocbuilder bash +docker run -it --rm -v $PWD/:/tmp/pyircbot/ pybdocbuilder bash diff --git a/docs/builder/build.sh b/docs/builder/build.sh index 1480bcb..64e7c4b 100755 --- a/docs/builder/build.sh +++ b/docs/builder/build.sh @@ -1,3 +1,4 @@ #!/bin/sh -ex docker build -t pybdocbuilder -f docs/builder/Dockerfile . + diff --git a/docs/changelog.rst b/docs/changelog.rst index 485d61b..4e305be 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,8 +2,17 @@ Changelog ========= -* :release:`4.1.0 <2017-03-28>` +* :release:`4.1.0 <2019-02-10>` +* :support:`-` First documented release in awhile. Many new modules and tests have been added. See the git log if you so desire. +* :feature:`-` Added StockPlay module +* :feature:`-` Upgraded docker base image to ubuntu:bionic +* :feature:`-` Misc macOs related fixes +* :feature:`-` Misc python 3.7 related fixes +* :feature:`-` Misc fixes preventing doc building + +* :release:`4.0.0 <2017-03-28>` * :support:`-` Added a changelog * :feature:`-` Dropped use of deprecated asynchat in favor of asyncio - Python 3.5+ now required. * :support:`-` Minor docs cleanup * :feature:`-` Upgraded docker base image to ubuntu:xenial + diff --git a/requirements-test.txt b/requirements-test.txt index 376488f..1ffa34d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -8,6 +8,7 @@ CherryPy==14.2.0 coverage==4.5.1 execnet==1.5.0 idna==2.6 +lxml==4.3.1 more-itertools==4.1.0 -e git+http://git.davepedu.com/dave/pymsgbus.git@373a9c5f153078fce57bde43f493785859f51de4#egg=msgbus pluggy==0.6.0 @@ -27,6 +28,7 @@ pytest-xdist==1.22.2 -e git+https://github.com/jgarzik/python-bitcoinrpc.git@76ced424dc16f997365265487487056e653238c6#egg=python_bitcoinrpc pytz==2018.4 pyzmq==17.0.0 +-e git+https://github.com/bitprophet/releases.git@1.6.1#egg=releases requests==2.18.4 six==1.11.0 tempora==1.11 diff --git a/requirements.txt b/requirements.txt index 25abe4b..d1275bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ chardet==3.0.4 cheroot==6.2.4 CherryPy==14.2.0 idna==2.6 +lxml==4.3.1 more-itertools==4.1.0 -e git+http://git.davepedu.com/dave/pymsgbus.git@373a9c5f153078fce57bde43f493785859f51de4#egg=msgbus portend==2.2