From 252100e5ccb90be8a3909b378ba2fad378b8d7ad Mon Sep 17 00:00:00 2001 From: Gaurav Mishra Date: Mon, 7 Jan 2019 16:23:07 +0530 Subject: [PATCH 1/3] fix(setup.py): Install pip packages for current user Signed-off-by: Gaurav Mishra --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c453e746..140c38a0 100755 --- a/setup.py +++ b/setup.py @@ -84,10 +84,12 @@ def run(self): global install_options global build_requirements global ext_links + + install_only_user = [] if os.geteuid() != 0: - install_options += ['--user'] + install_only_user = ['--user'] - subprocess.run(install_options + build_requirements, check = True) + subprocess.run(install_options + install_only_user + build_requirements, check = True) for package in ext_links: subprocess.run(install_options + ['-e', package], check = True) From 95bd5f7559d20a74f6be9e7daed87948ca49aaf2 Mon Sep 17 00:00:00 2001 From: Gaurav Mishra Date: Mon, 7 Jan 2019 17:04:43 +0530 Subject: [PATCH 2/3] docs(README): Added more info on dependencies Signed-off-by: Gaurav Mishra --- README.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e3a64459..93333173 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,20 @@ http://fossology.github.io/atarashi ## Steps for Installation +### Installing dependencies + +Dependencies are required before building Atarashi. You can install them in +following ways: + +- `pip install -r requirements.txt` + +OR + +- `# python setup.py install_deps` + +However, the dependencies are installed while installing Atarashi (running +[install command](#install)) + ### Build (optional) - `$ python setup.py build` @@ -35,11 +49,6 @@ http://fossology.github.io/atarashi - `# python setup.py install` -### Installing just dependencies - -- `pip install -r requirements.txt` - - ## How to run Get the help by running `atarashi -h` or `atarashi --help` From 42070e989c3b8489152668c2ce2ab580d8de79da Mon Sep 17 00:00:00 2001 From: Rob Guinness Date: Mon, 7 Jan 2019 17:17:00 +0200 Subject: [PATCH 3/3] Adds clarification regarding the need to install dependencies prior to building the package --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a2a829c..36cf4d89 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,12 @@ http://fossology.github.io/atarashi ### Build (optional) -- `$ python setup.py build` +- Install the dependencies: + + `$ pip install -r requirements.txt` +- Build the package using Setuptools: + + `$ python setup.py build` - Build will generate 3 new files in your current directory 1. `data/Ngram_keywords.json` 2. `licenses/.csv`