diff --git a/docker/Dockerfile b/docker/Dockerfile index a76fb21266..b3d9a5c94d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,8 +16,8 @@ ARG acapy_name="aries-cloudagent" ARG acapy_version ARG acapy_reqs=[askar,didcommv2] -ENV HOME="/home/$user" \ - APP_ROOT="$HOME" \ +ENV HOME="/home/$user" +ENV APP_ROOT="$HOME" \ LC_ALL=C.UTF-8 \ LANG=C.UTF-8 \ PIP_NO_CACHE_DIR=off \ @@ -96,7 +96,9 @@ USER $user COPY --from=build /src/dist/aries_cloudagent*.whl . RUN aries_cloudagent_package=$(find ./ -name "aries_cloudagent*.whl" | head -n 1) && \ echo "Installing ${aries_cloudagent_package} ..." && \ - pip install --no-cache-dir --find-links=. ${aries_cloudagent_package}${acapy_reqs} && \ + pip install --no-cache-dir --find-links=. \ + --extra-index-url https://test.pypi.org/simple/ \ + ${aries_cloudagent_package}${acapy_reqs} && \ rm aries_cloudagent*.whl && \ chmod +rx $(python -m site --user-site) $HOME/.local diff --git a/poetry.lock b/poetry.lock index de025a3366..775f1f6b42 100644 --- a/poetry.lock +++ b/poetry.lock @@ -224,23 +224,25 @@ tests = ["apispec[marshmallow,yaml]", "openapi-spec-validator (==0.7.1)", "pytes yaml = ["PyYAML (>=3.10)"] [[package]] -name = "aries_askar" -version = "0.3.2" -description = "" +name = "aries-askar-ff137" +version = "0.3.3b0" +description = "UNKNOWN" optional = true python-versions = ">=3.6.3" -files = [] -develop = false +files = [ + {file = "aries_askar_ff137-0.3.3b0-py3-none-macosx_10_9_universal2.whl", hash = "sha256:32d6ed2366527b733a6025c19fb6f52f4547a3b2693cc11a1175b0ca3bfc8792"}, + {file = "aries_askar_ff137-0.3.3b0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:54214ac04c3f06d7dc302c0592787f9a998c8e104f8f2ee382fc2645efef6e41"}, + {file = "aries_askar_ff137-0.3.3b0-py3-none-manylinux2014_x86_64.whl", hash = "sha256:c7f5517c3c910aa34cee9359e184388f320d14bac7296b37d9dca4026c254bba"}, + {file = "aries_askar_ff137-0.3.3b0-py3-none-win_amd64.whl", hash = "sha256:5bdf83bdaacd4dc43a34a3a58c43e165a0b66303c9bddded64cdf6f84e015ee0"}, +] [package.dependencies] -cached_property = ">=1.5.2,<1.6.0" +cached-property = ">=1.5.2,<1.6.0" [package.source] -type = "git" -url = "https://github.com/ff137/aries-askar.git" -reference = "test/order-by-scan" -resolved_reference = "15564e50542313abff570b45711ba71587c4d855" -subdirectory = "wrappers/python" +type = "legacy" +url = "https://test.pypi.org/simple" +reference = "testpypi" [[package]] name = "async-timeout" @@ -2895,11 +2897,11 @@ idna = ">=2.0" multidict = ">=4.0" [extras] -askar = ["anoncreds", "aries-askar", "indy-credx", "indy-vdr"] +askar = ["anoncreds", "aries-askar-ff137", "indy-credx", "indy-vdr"] bbs = ["ursa-bbs-signatures"] didcommv2 = ["didcomm-messaging"] [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "6ba6e8965168a1c0143ccd03083366bd2b8f51dfa48d2df4c354eabebec99ad7" +content-hash = "0c556d2cbc5cce0392c98941b00bba7ab5dde688559c97c68f7f71a5cc9692be" diff --git a/pyproject.toml b/pyproject.toml index c5fd3542e9..b2fa87e67f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ did-peer-4 = "^0.1.4" uuid_utils = "^0.9.0" # askar -aries-askar= { git = "https://github.com/ff137/aries-askar.git", branch = "test/order-by-scan", subdirectory = "wrappers/python", optional = true } +aries-askar-ff137 = {version = "^0.3.3b0", source = "testpypi", optional = true} indy-credx= { version = "~1.1.1", optional = true } indy-vdr= { version = "~0.4.0", optional = true } anoncreds= { version = "0.2.0", optional = true } @@ -82,7 +82,7 @@ pytest-ruff = "^0.4.1" [tool.poetry.extras] askar = [ - "aries-askar", + "aries-askar-ff137", "indy-credx", "indy-vdr", "anoncreds" @@ -97,6 +97,11 @@ didcommv2 = [ [tool.poetry.scripts] aca-py = "aries_cloudagent.__main__:script_main" +[[tool.poetry.source]] +name = "testpypi" +url = "https://test.pypi.org/simple/" +priority = "supplemental" + [tool.ruff] lint.select = ["B006", "C", "D", "E", "F"]