diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c768c9..9fb1e75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,11 +103,10 @@ jobs: image: ubuntu-2004:202111-01 steps: - run: - name: Install dependencies as root + name: Install dependencies command: | - export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true - sudo apt-get update - sudo apt-get install -y git ssh python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-colorama + sudo pip3 install poetry + poetry install # https://www.atlantic.net/dedicated-server-hosting/how-to-install-and-use-podman-on-ubuntu-20-04/ - run: name: Install podman on Ubuntu 20.04 @@ -127,18 +126,12 @@ jobs: sudo chown -R $USER:$USER /caches - restore_cache: *restore-cache - run: *copy-image - - run: - name: Build the .deb package and install it as root - command: | - ./install/linux/build-deb.py - sudo dpkg -i deb_dist/dangerzone_*-1_all.deb - ls -lh deb_dist/dangerzone_*-1_all.deb - run: name: Convert each test document command: | for FILE in $(ls test_docs); do echo Converting $FILE - dangerzone-cli test_docs/$FILE + poetry run ./dev_scripts/dangerzone-cli test_docs/$FILE echo done diff --git a/BUILD.md b/BUILD.md index 7885d8f..c8b856b 100644 --- a/BUILD.md +++ b/BUILD.md @@ -110,7 +110,7 @@ The output is in the `dist` folder. Install [Docker Desktop](https://www.docker.com/products/docker-desktop). -Install Python 3.9.9 (x86) [[from python.org])(https://www.python.org/downloads/release/python-399/). When installing it, make sure to check the "Add Python 3.9 to PATH" checkbox on the first page of the installer. +Install Python 3.9.9 (x86) [from python.org](https://www.python.org/downloads/release/python-399/). When installing it, make sure to check the "Add Python 3.9 to PATH" checkbox on the first page of the installer. Install [poetry](https://python-poetry.org/). Open PowerShell, and run: