Introduce poetry to lock dependencies

Author: Hanfei Shen

.github/workflows/test.yml

@@ -14,10 +14,15 @@ env:
 jobs:
   test:
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        poetry-version: [1.1.6]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
+      - name: Install Poetry
+        run: pip install poetry==${{ matrix.poetry-version }}
       - name: Install requirements
-        run: pip install -r requirements_plus_development_frozen.txt
+        run: poetry install
       - name: Run tests
         run: pytest

Dockerfile

@@ -1,19 +1,26 @@
+FROM python:3.9-slim AS builder
+
+ARG POETRY_VERSION=1.1.4
+RUN pip install poetry==$POETRY_VERSION
+
+WORKDIR /src
+
+COPY pyproject.toml poetry.lock README.md pylintrc ./
+COPY marge/ ./marge/
+RUN poetry export -o requirements.txt && \
+  poetry build
+
+
 FROM python:3.9-slim
 
 RUN apt-get update && apt-get install -y \
   git-core \
   && \
   rm -rf /var/lib/apt/lists/*
 
-WORKDIR /src
-
-ADD requirements_frozen.txt ./
-RUN pip install -r ./requirements_frozen.txt
+COPY --from=builder /src/requirements.txt /src/dist/marge-*.tar.gz /tmp/
 
-ADD version ./
-ADD setup.py ./
-ADD marge.app ./
-ADD marge/ ./marge/
-RUN python ./setup.py install
+RUN pip install -r /tmp/requirements.txt && \
+  pip install /tmp/marge-*.tar.gz
 
-ENTRYPOINT ["marge.app"]
+ENTRYPOINT ["marge"]

Makefile

@@ -6,14 +6,25 @@ all: dockerize
 .PHONY: bump
 bump: bump-requirements
 
-.PHONY: bump-requirements
-bump-requirements: clean requirements_frozen.txt
+poetry.lock:
+	poetry install
+
+requirements.txt: poetry.lock
+	poetry export -o $@
+
+requirements_development.txt: poetry.lock
+	poetry export --dev -o $@
 
-requirements_frozen.txt: requirements.txt
-	pip freeze -r $^ > $@
+.PHONY: bump-poetry-lock
+bump-poetry-lock:
+	poetry update
 
-requirements_plus_development_frozen.txt: requirements_frozen.txt
-	pip freeze -r $^ -r requirements_development.txt > $@
+.PHONY: clean-requirements
+clean-requirements:
+	rm -rf requirements.txt requirements_development.txt
+
+.PHONY: bump-requirements
+bump-requirements: bump-poetry-lock clean-requirements requirements.txt requirements_development.txt
 
 .PHONY: dockerize
 dockerize:

marge.app

@@ -0,0 +1,19 @@
+from marge.app import main
+
+
+def run():
+    try:
+        main()
+    except Exception as err:
+        print('Exception occured')
+        if hasattr(err, 'stdout'):
+            # pylint: disable=no-member
+            print(f'stdout was: {err.stdout}')
+        if hasattr(err, 'stderr'):
+            # pylint: disable=no-member
+            print(f'stderr was: {err.stderr}')
+        raise
+
+
+if __name__ == '__main__':
+    run()