From 2b893e474baa42685a8fa83c531a5b48f09e945a Mon Sep 17 00:00:00 2001 From: Dominik Pataky Date: Fri, 10 Apr 2020 10:56:07 +0200 Subject: [PATCH] Fix regenesis dependency installation Until now the dependency of regenesis had to be installed manually from datenguide/regenesis. In the new version of setup.py, this installation from a non-package source is fixed and automatically resolved. The import uses the pip ' @ ' format, since dependency links were deprecated in pip. --- README.md | 15 +++------------ setup.py | 10 ++++------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index f894935..d5dace7 100644 --- a/README.md +++ b/README.md @@ -16,18 +16,9 @@ For example, it is used within (and developed for) the ## install -`genesapi-cli` requires python 3. +`genesapi-cli` requires Python 3. We recommend organizing your Python stuff via pip and virtual environments. -We recommend organizing your python stuff via pip and virtual environments. - -**FIXME**: `genesapi-cli` relies on a fork of -[regenesis](https://github.com/pudo/regenesis), that needs to be installed -manually beforehand, any pull requests to hook this properly into our -`setup.py` are welcomed ;) - - pip install -e git+git@github.com:datenguide/regenesis.git#egg=regenesis - - pip install -e git+git@github.com:datenguide/genesapi-cli.git#egg=genesapi + pip install -e 'git+https://github.com/datenguide/genesapi-cli.git#egg=genesapi' This will install the `genesapi` command-line interface and all the requirements, like [pandas](https://pandas.pydata.org) (see their [install @@ -119,7 +110,7 @@ into Elasticsearch, the other tasks are needed in between (see below) `genesapi` prints a lot to `stdout`, for instance the jsonified *facts* so that they can easily piped to logstash, so logging happens to `stderr` -You can adjust the logging level (default: `INFO`) to any valid python logging +You can adjust the logging level (default: `INFO`) to any valid Python logging level, for example: genesapi --logging DEBUG diff --git a/setup.py b/setup.py index fc2d283..5121943 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ def readme(): author_email='simon.woerpel@medienrevolte.de', license='MIT', packages=['genesapi'], + python_requires='>=3.5', entry_points={ 'console_scripts': [ 'genesapi=genesapi.entry:main' @@ -37,13 +38,10 @@ def readme(): 'python-frontmatter', 'awesome-slugify', 'zeep', - 'regenesis', 'python-dateutil', - 'elasticsearch' + 'elasticsearch', + + 'regenesis @ https://github.com/datenguide/regenesis/tarball/master#egg=regenesis', ], - # FIXME see README.md about regenesis install note - # dependency_links=[ - # 'https://github.com/datenguide/regenesis/tarball/master#egg=regenesis-0.1' - # ], zip_safe=False )