From cf124995ba30731d66d76f9aa1a95e508da04180 Mon Sep 17 00:00:00 2001 From: Jithin James Date: Mon, 15 May 2023 00:19:23 +0530 Subject: [PATCH 1/2] fix requirements --- .gitignore | 3 --- pyproject.toml | 3 ++- ragas/_version.py | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 ragas/_version.py diff --git a/.gitignore b/.gitignore index ad3a19fb2..68bc17f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -158,6 +158,3 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ -belar/_version.py -**/tmp.ipynb -ragas/_version.py diff --git a/pyproject.toml b/pyproject.toml index f7f6a0dc7..56494043b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,8 @@ dependencies = [ "sentence-transformers", "nltk", "datasets", - "spacy", + "spacy<4.0.0,>=3.0.0", + "en-core-web-sm", ] dynamic = ["version", "readme"] diff --git a/ragas/_version.py b/ragas/_version.py new file mode 100644 index 000000000..404f41251 --- /dev/null +++ b/ragas/_version.py @@ -0,0 +1,4 @@ +# file generated by setuptools_scm +# don't change, don't track in version control +__version__ = version = "0.0.1a2.dev23+g10ed261.d20230513" +__version_tuple__ = version_tuple = (0, 0, 1, "dev23", "g10ed261.d20230513") From 40af06709629c4536274a12da7a532340700dd55 Mon Sep 17 00:00:00 2001 From: Jithin James Date: Mon, 15 May 2023 00:41:25 +0530 Subject: [PATCH 2/2] added __version__ to package --- .github/workflows/python-publish.yml | 5 ++++- .gitignore | 1 + ragas/__init__.py | 6 ++++++ ragas/_version.py | 4 ---- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 ragas/_version.py diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index d274e771d..6e4ac7e98 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -21,6 +21,8 @@ jobs: environment: pypi-release steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v3 with: @@ -28,7 +30,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install build + pip install --upgrade setuptools + pip install --upgrade build - name: Build package run: python -m build - name: Publish package diff --git a/.gitignore b/.gitignore index 68bc17f9f..3f4697dee 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,4 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ +ragas/_version.py diff --git a/ragas/__init__.py b/ragas/__init__.py index e69de29bb..c0b7c007d 100644 --- a/ragas/__init__.py +++ b/ragas/__init__.py @@ -0,0 +1,6 @@ +try: + from ._version import version as __version__ + from ._version import version_tuple +except ImportError: + __version__ = "unknown version" + version_tuple = (0, 0, "unknown version") diff --git a/ragas/_version.py b/ragas/_version.py deleted file mode 100644 index 404f41251..000000000 --- a/ragas/_version.py +++ /dev/null @@ -1,4 +0,0 @@ -# file generated by setuptools_scm -# don't change, don't track in version control -__version__ = version = "0.0.1a2.dev23+g10ed261.d20230513" -__version_tuple__ = version_tuple = (0, 0, 1, "dev23", "g10ed261.d20230513")