diff --git a/.gitignore b/.gitignore index eed79319..594ea4b0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ __pycache__/ # Distribution / packaging .Python build/ -doveauth/dist/ develop-eggs/ dist/ downloads/ diff --git a/chatmail-pyinfra/src/chatmail/__init__.py b/chatmail-pyinfra/src/chatmail/__init__.py index af5b2a8b..e2e46faf 100644 --- a/chatmail-pyinfra/src/chatmail/__init__.py +++ b/chatmail-pyinfra/src/chatmail/__init__.py @@ -14,7 +14,7 @@ def _install_doveauth() -> None: """Setup chatctl.""" doveauth_filename = "doveauth-0.1.tar.gz" doveauth_path = importlib.resources.files(__package__).joinpath( - f"../../../doveauth/dist/{doveauth_filename}" + f"../../../dist/{doveauth_filename}" ) remote_path = f"/tmp/{doveauth_filename}" if Path(str(doveauth_path)).exists(): @@ -35,7 +35,7 @@ def _install_filtermail() -> None: """Setup filtermail.""" filtermail_filename = "filtermail-0.1.tar.gz" filtermail_path = importlib.resources.files(__package__).joinpath( - f"../../../filtermail/dist/{filtermail_filename}" + f"../../../dist/{filtermail_filename}" ) remote_path = f"/tmp/{filtermail_filename}" if Path(str(filtermail_path)).exists(): diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 0571e001..265804ab 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,15 +2,9 @@ : ${CHATMAIL_DOMAIN:=c1.testrun.org} export CHATMAIL_DOMAIN -pushd doveauth -venv/bin/python3 -m build -popd - -pushd filtermail -venv/bin/python3 -m build -popd +venv/bin/python3 -m build --sdist doveauth --outdir dist +venv/bin/python3 -m build --sdist filtermail --outdir dist chatmail-pyinfra/venv/bin/pyinfra --ssh-user root "$CHATMAIL_DOMAIN" deploy.py -#rm -r doveauth/dist/ -#rm -r filtermail/dist/ +rm -r dist/ diff --git a/scripts/init.sh b/scripts/init.sh index b31a2c90..149aa052 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -5,12 +5,11 @@ chatmail-pyinfra/venv/bin/pip install -e chatmail-pyinfra chatmail-pyinfra/venv/bin/pip install -e doveauth python3 -m venv doveauth/venv -doveauth/venv/bin/pip install pytest build +doveauth/venv/bin/pip install pytest doveauth/venv/bin/pip install -e doveauth python3 -m venv online-tests/venv online-tests/venv/bin/pip install pytest pytest-timeout pdbpp deltachat -python3 -m venv filtermail/venv -filtermail/venv/bin/pip install build -filtermail/venv/bin/pip install -e filtermail +python3 -m venv venv +venv/bin/pip install build