From 443c00567c95aaf4e5674353e54ccbad43a981d6 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 1 Oct 2021 13:03:01 +0200 Subject: [PATCH 1/4] NOP: Whitespace. I'm a newline kind of guy. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a10fbf..b6507c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,4 @@ RUN echo github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK RUN git config --global user.name "Backtab server" && git config --global user.email "backtab@example.com" CMD ["/bin/bash", "/docker-startup.sh"] -EXPOSE 4903 \ No newline at end of file +EXPOSE 4903 From 3364a551b3f1c13a1baa5faa9abbc6109550d6aa Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 1 Oct 2021 13:11:40 +0200 Subject: [PATCH 2/4] Remove seemingly unused / commented command Was going to remove Mercurial from this line because that dependency is no longer required after getting the Python beancount module from PyPI. But it looks like this line was not used anyway. --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b6507c9..0563ed0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM python:3 RUN mkdir /srv/backtab/ -#RUN apt-get -y update && apt-get install git mercurial WORKDIR /usr/src/app COPY requirements.txt ./ From d0c4b98323ad7410bf5cd1b6ad72c76544858e91 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 1 Oct 2021 13:05:29 +0200 Subject: [PATCH 3/4] Pin Python to version 3.8. Latest Python (3.9 at the time of writing) breaks compilation of some modules (e.g. PyYAML). Stick to Python 3.8 for now. Python 3.8 will receive security support until October 2024. See https://endoflife.date/python --- Dockerfile | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0563ed0..3f72f1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.8 RUN mkdir /srv/backtab/ WORKDIR /usr/src/app diff --git a/README.md b/README.md index 5c2415d..9494f37 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,8 @@ backtab to use a ssh:// url; if so, add your SSH private key to Running natively ---------------- +**NOTE:** +Backtab is currently not compatible with Python 3.9 or later. Please use Python 3.8. Check out a copy of your data repository wherever you find convenient. We'll call that location `/srv/backtab/tab-data`. From c922719c4ddd96b1f0a5f5186db966ade6e75f7c Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 1 Oct 2021 13:06:51 +0200 Subject: [PATCH 4/4] Get beancount from PyPI. The beancount module is available on PyPI now. --- requirements.txt | 2 +- setup.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4197a4c..5b33a58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ --e hg+https://bitbucket.org/blais/beancount#egg=beancount +beancount >= 2, < 3 bottle >= 0.12, < 0.13 PyYAML >= 3.13, <4 click >= 7.0, <8 diff --git a/setup.py b/setup.py index 7a4ac05..c0d72a1 100755 --- a/setup.py +++ b/setup.py @@ -19,9 +19,6 @@ "bottle >= 0.12, <0.13", "PyYAML >= 3.13, <4", "sdnotify >= 0.3.1, <0.4", - "beancount", - ], - dependency_links=[ - "hg+https://bitbucket.org/blais/beancount#egg=beancount", + "beancount >= 2, < 3", ], )