From d835a9cdc581791d85e2b8bfea2858123b2458f2 Mon Sep 17 00:00:00 2001 From: Ikram Ali Date: Tue, 22 Jun 2021 12:43:26 +0500 Subject: [PATCH] [setup] version tag added to Haystack fix #1175 (#1216) --- haystack/__init__.py | 1 + haystack/_version.py | 1 + setup.py | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 haystack/_version.py diff --git a/haystack/__init__.py b/haystack/__init__.py index 677f71255..f926fe746 100644 --- a/haystack/__init__.py +++ b/haystack/__init__.py @@ -4,6 +4,7 @@ import pandas as pd from haystack.schema import Document, Label, MultiLabel, BaseComponent from haystack.finder import Finder from haystack.pipeline import Pipeline +from haystack._version import __version__ pd.options.display.max_colwidth = 80 diff --git a/haystack/_version.py b/haystack/_version.py new file mode 100644 index 000000000..3e2f46a3a --- /dev/null +++ b/haystack/_version.py @@ -0,0 +1 @@ +__version__ = "0.9.0" diff --git a/setup.py b/setup.py index 341f6dbae..4f890a429 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +import os +import re from io import open from setuptools import find_packages, setup @@ -45,9 +47,24 @@ def get_dependency_links(filename): dependency_links = get_dependency_links('requirements.txt') parsed_requirements = parse_requirements('requirements.txt') + +def versionfromfile(*filepath): + infile = os.path.join(*filepath) + with open(infile) as fp: + version_match = re.search( + r"^__version__\s*=\s*['\"]([^'\"]*)['\"]", fp.read(), re.M + ) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string in {}.".format(infile)) + + +here = os.path.abspath(os.path.dirname(__file__)) +_version: str = versionfromfile(here, "haystack", "_version.py") + setup( name="farm-haystack", - version="0.9.0", + version=_version, author="Malte Pietsch, Timo Moeller, Branden Chan, Tanay Soni", author_email="malte.pietsch@deepset.ai", description="Neural Question Answering & Semantic Search at Scale. Use modern transformer based models like BERT to find answers in large document collections", @@ -56,7 +73,7 @@ setup( keywords="QA Question-Answering Reader Retriever semantic-search search BERT roberta albert squad mrc transfer-learning language-model transformer", license="Apache", url="https://github.com/deepset-ai/haystack", - download_url="https://github.com/deepset-ai/haystack/archive/0.9.0.tar.gz", + download_url=f"https://github.com/deepset-ai/haystack/archive/{_version}.tar.gz", packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), dependency_links=dependency_links, install_requires=parsed_requirements,