Skip to content

Commit

Permalink
fix importlib-metadata dependency
Browse files Browse the repository at this point in the history
- use sed to replace package name prefix
- pinned importlib-metadata to 3.10.1 in setup.py

Signed-off-by: mgmgwi <guido.wischrop@mgm-tp.com>
  • Loading branch information
mgmgwi committed May 20, 2022
1 parent a0dc19d commit af29e5e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 0 additions & 5 deletions build-scripts/ubuntu-2004/prepare-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ sed -i -r "s~indy-node==([0-9\.]+[0-9])(\.)?([a-z]+)~indy-node==\1\~\3~" setup.p

if [ "$distro_packages" = "debian-packages" ]; then
# Only used for the deb package builds, NOT for the PyPi package builds.
# Update the package names to match the versions that are pre-installed on the os.
echo -e "\nAdapt the dependencies for the Canonical archive"
sed -i "s~timeout-decorator~python3-timeout-decorator~" setup.py
sed -i "s~distro~python3-distro~" setup.py

echo -e "\n\nPrepares indy-plenum debian package version"
sed -i -r "s~indy-plenum==([0-9\.]+[0-9])(\.)?([a-z]+)~indy-plenum==\1\~\3~" setup.py

Expand Down
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@
)],

install_requires=['indy-plenum==1.13.0.dev14',
'importlib-metadata<3.0',
# importlib-metadata needs to be pinned to 3.10.1 because from v4.0.0 the package
# name ends in python3-importlib-metadata_0.0.0_amd64.deb
# see also build-scripts/ubuntu-2004/build-3rd-parties.sh
# https://github.com/hyperledger/indy-plenum/blob/eac38674252b539216be2c40bb13e53c5b70dad2/build-scripts/ubuntu-2004/build-3rd-parties.sh#L104-L106
'importlib-metadata==3.10.1',
'timeout-decorator>=0.5.0',
'distro>=1.5.0'],
setup_requires=['pytest-runner'],
Expand Down

0 comments on commit af29e5e

Please sign in to comment.