#2289 Migrate to Poetry

.github/workflows/pythonpublish.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+          pip install setuptools wheel twine poetry
       - name: Build and publish
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          python setup.py sdist bdist_wheel
+          poetry build
           twine upload dist/*

.github/workflows/tests.yml

@@ -22,14 +22,9 @@ jobs:
           python-version: ${{ inputs.python-version }}
           cache: 'pip'
           cache-dependency-path: 'requirements*.txt'
-      - name: Install dependencies
+      - name: Install the project dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip3 install --no-cache-dir \
-            -r requirements.txt \
-            -r requirements.askar.txt \
-            -r requirements.bbs.txt \
-            -r requirements.dev.txt
+          pip install poetry
+          poetry install -E "askar bbs"
       - name: Tests
-        run: |
-          pytest
+        run: poetry run pytest

.gitignore

@@ -189,8 +189,4 @@ _build/
 **/*.iml
 
 # Open API build
-open-api/.build
-
-# poetry
-poetry.lock
-pyproject.toml
+open-api/.build

aries_cloudagent/__main__.py

@@ -64,11 +64,16 @@ def run(args):
     run_command(command, args)
 
 
+def script_main():
+    """Run the main function as a script for poetry."""
+    main(sys.argv)
+
+
 def main(args):
     """Execute default entry point."""
-    if __name__ == "__main__":
-        init_debug(args)
-        run(args)
+    init_debug(args)
+    run(args)
 
 
-main(sys.argv)
+if __name__ == "__main__":
+    script_main()

docker/Dockerfile

@@ -5,8 +5,8 @@ WORKDIR /src
 
 ADD . .
 
-RUN pip install setuptools wheel
-RUN python setup.py sdist bdist_wheel
+RUN pip install --no-cache-dir poetry
+RUN poetry build
 
 FROM python:${python_version}-slim-bullseye AS main
 

docker/Dockerfile.demo

@@ -10,20 +10,15 @@ RUN mkdir -p bin && curl -L -o bin/jq \
 	https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \
 	chmod ug+x bin/jq
 
-# Add and install Indy Agent code
-ADD requirements*.txt ./
+# Add and install Aries Agent code
+RUN pip install --no-cache-dir poetry
 
-RUN pip3 install --no-cache-dir \
-	-r requirements.txt \
-	-r requirements.askar.txt \
-	-r requirements.bbs.txt \
-	-r requirements.dev.txt
+ADD README.md pyproject.toml poetry.lock ./
+
+RUN poetry install --no-root --no-directory -E "askar bbs"
 
 ADD aries_cloudagent ./aries_cloudagent
-ADD bin ./bin
-ADD README.md ./
 ADD scripts ./scripts
-ADD setup.py ./
 
 RUN pip3 install --no-cache-dir -e .
 

docker/Dockerfile.indy

@@ -188,19 +188,16 @@ WORKDIR /home/indy/src
 
 RUN mkdir -p test-reports && chown -R indy:indy test-reports && chmod -R ug+rw test-reports
 
-ADD requirements*.txt ./
+ADD ./README.md pyproject.toml ./poetry.lock ./
 
 USER root
-RUN pip3 install --no-cache-dir \
-    -r requirements.txt \
-    -r requirements.askar.txt \
-    -r requirements.bbs.txt \
-    -r requirements.dev.txt
+RUN pip install --no-cache-dir poetry
+RUN poetry install --no-root --no-directory -E "askar bbs indy"
 
 ADD --chown=indy:root . .
 USER indy
 
-ENTRYPOINT ["/bin/bash", "-c", "pytest \"$@\"", "--"]
+ENTRYPOINT ["/bin/bash", "-c", "poetry run pytest \"$@\"", "--"]
 
 # ACA-Py Builder
 # Build ACA-Py wheel using setuptools
@@ -210,8 +207,8 @@ WORKDIR /src
 
 ADD . .
 
-RUN pip install setuptools wheel
-RUN python setup.py sdist bdist_wheel
+RUN pip install --no-cache-dir poetry
+RUN poetry build
 
 
 # ACA-Py Indy

docker/Dockerfile.run

@@ -4,23 +4,17 @@ ENV ENABLE_PTVSD 0
 
 # For consistency with base images, include curl for healthchecks
 RUN apt-get update && apt-get install -y curl && apt-get clean
-ADD requirements*.txt ./
 
-RUN pip3 install --no-cache-dir \
-    -r requirements.txt \
-    -r requirements.askar.txt \
-    -r requirements.bbs.txt \
-    -r requirements.dev.txt
+RUN pip install --no-cache-dir poetry
 
-RUN mkdir aries_cloudagent && touch aries_cloudagent/__init__.py
-ADD aries_cloudagent/version.py aries_cloudagent/version.py
-ADD bin ./bin
-ADD README.md ./
-ADD setup.py ./
+ADD . .
+
+RUN poetry install -E "askar bbs"
 
-RUN pip3 install --no-cache-dir -e .
+RUN mkdir -p aries_cloudagent && touch aries_cloudagent/__init__.py
+ADD aries_cloudagent/version.py aries_cloudagent/version.py
 
-RUN mkdir logs && chmod -R ug+rw logs
+RUN mkdir -p logs && chmod -R ug+rw logs
 ADD aries_cloudagent ./aries_cloudagent
 
-ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
+ENTRYPOINT ["/bin/bash", "-c", "poetry run aca-py \"$@\"", "--"]

docker/Dockerfile.test

@@ -9,14 +9,12 @@ RUN apt-get update -y && \
 
 WORKDIR /usr/src/app
 
-ADD requirements*.txt ./
+RUN pip install --no-cache-dir poetry
 
-RUN pip3 install --no-cache-dir \
-	-r requirements.txt \
-	-r requirements.askar.txt \
-	-r requirements.bbs.txt \
-	-r requirements.dev.txt
+ADD ./README.md pyproject.toml ./poetry.lock ./
+
+RUN poetry install --no-root --no-directory -E "askar bbs"
 
 ADD . .
 
-ENTRYPOINT ["/bin/bash", "-c", "pytest \"$@\"", "--"]
+ENTRYPOINT ["/bin/bash", "-c", "poetry run pytest \"$@\"", "--"]