Skip to content

Commit c34099f

Browse files
Fix dependency conflicts for python package install
Signed-off-by: George J Padayatti <[email protected]>
1 parent bc12ca8 commit c34099f

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

requirements.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
aries-cloudagent==0.5.6
21
astroid==2.5.6
32
async-timeout==3.0.1
43
asynctest==0.13.0
54
attrs==21.2.0
65
autopep8==1.5.7
76
base58==2.0.1
87
cachetools==4.2.2
8+
aries-cloudagent==0.5.6
99
certifi==2021.5.30
1010
cffi==1.14.5
1111
chardet==3.0.4
@@ -32,7 +32,6 @@ Pillow==7.2.0
3232
ply==3.11
3333
prompt-toolkit==2.0.10
3434
py-multicodec==0.2.1
35-
pycodestyle==2.7.0
3635
pycparser==2.20
3736
pydantic==1.8.2
3837
pydid==0.3.0
@@ -58,10 +57,4 @@ wrapt==1.12.1
5857
yarl==1.5.1
5958
py-multibase==1.0.3
6059
validators==0.18.2
61-
semver==2.13.0
62-
aiohttp==3.7.4.post0
63-
aiohttp-apispec==2.2.1
64-
aiohttp-cors==0.7.0
65-
aiohttp-jinja2==1.4.2
66-
aioredis==1.3.1
67-
apispec==3.3.2
60+
semver==2.13.0

setup.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
from setuptools import setup, find_packages
55
import importlib.util
66

7+
import subprocess
8+
import sys
9+
10+
reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
11+
installed_packages = [r.decode().split('==')[0] for r in reqs.split()]
12+
713
PACKAGE_NAME = "acapy-mydata-did-protocol"
814
version_meta = runpy.run_path("./version.py".format(PACKAGE_NAME))
915
VERSION = version_meta["__version__"]
@@ -18,7 +24,7 @@ def parse_requirements(filename):
1824
for line in lineiter:
1925
if line and not line.startswith("#"):
2026
# check if already installed ?
21-
if line.startswith("aries-cloudagent") and (spec := importlib.util.find_spec("aries-cloudagent")) is None:
27+
if line.startswith("aries-cloudagent") and "aries-cloudagent" in installed_packages:
2228
continue
2329

2430
requirements_list.append(line)

0 commit comments

Comments
 (0)