From b644b4ea37deb2ea1fd3d775c6c036a6795eca76 Mon Sep 17 00:00:00 2001
From: Dariusz Kedzierski <dkedzierski@syncad.com>
Date: Thu, 13 Aug 2020 11:48:45 +0200
Subject: [PATCH] Install wrapper fixes
- it seems that install_requires is ignored when calling install.run
from install wrapper. install.do_egg_install() should fix the problem
---
scripts/ci_sync.sh | 1 -
setup.py | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/ci_sync.sh b/scripts/ci_sync.sh
index 5fba5287f..5c2dd84b0 100755
--- a/scripts/ci_sync.sh
+++ b/scripts/ci_sync.sh
@@ -43,7 +43,6 @@ sleep 5
ls -l dist/*
rm -rf ./local-site
mkdir -p `python3 -m site --user-site`
-pip3 install importlib_metadata --user
python3 setup.py install --user --force
ln -sf ./local-site/bin/hive $HIVE_NAME
./$HIVE_NAME -h
diff --git a/setup.py b/setup.py
index b381656ff..094efa32b 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ class BuildWrapper(build_py):
class InstallWrapper(install):
def run(self):
GitRevisionProvider.provide_git_revision()
- install.run(self)
+ install.do_egg_install(self)
# yapf: disable
setup(
@@ -94,6 +94,7 @@ setup(
]
},
cmdclass={
- 'install': InstallWrapper,
- 'build_py':BuildWrapper}
+ 'install' : InstallWrapper,
+ 'build_py' : BuildWrapper
+ }
)
--
GitLab