From cbde9498f392f4409d194a70b8a1cbceb8d64c63 Mon Sep 17 00:00:00 2001 From: Kimi Li Date: Tue, 31 Jan 2023 16:40:44 -0500 Subject: [PATCH 1/3] fix: issue within setup.py that creates concatenated requirement setuptools<59.7.0nltk==3.6.2 --- setup.py | 87 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/setup.py b/setup.py index 44a47dccc..12cde3560 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def read(fname): def recursive_requirements(search: str, transformation_type: str) -> str: # (1) read all requirements.txt in the folder. - requirements = "" + requirements = "\n" for folder in all_folders(search, transformation_type): r_file = os.path.join( os.path.dirname(__file__), folder + "/requirements.txt" @@ -142,45 +142,46 @@ def get_extra_requirements() -> dict: requirements[entry] = filter_requirements(req_string) return requirements - -setup( - name=NAME, - version=__version__, - description="NL-Augmenter: A Framework for Task-Sensitive Natural Language Augmentation", - author_email="nl-augmenter@googlegroups.com", - - long_description=read("README.md"), - long_description_content_type="text/markdown", - license="MIT", - url="https://github.com/GEM-benchmark/NL-Augmenter", - project_urls={ - "Bug Tracker": "https://github.com/GEM-benchmark/NL-Augmenter/issues", - "Web Page": "https://gem-benchmark.com/nl_augmenter", - }, - install_requires=get_default_requirements(), - extras_require=get_extra_requirements(), - keywords=[ - "augmentation", - "natural language processing", - "NLP", - "filters", - "deep learning", - "text processing", - "machine learning", - ], - classifiers=[ - "License :: OSI Approved :: MIT License", - "Intended Audience :: Developers", - "Intended Audience :: Information Technology", - "Intended Audience :: Science/Research", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Operating System :: OS Independent", - ], - packages=find_packages(exclude=["test", "docs"]), - package_data={ - "": ["*.json", "*.txt", "*.tsv", "*.csv", "*.npz", "*.ckpt"] - }, - include_package_data=True, - python_requires=">=3.7", -) +print(get_default_requirements()) + +# setup( +# name=NAME, +# version=__version__, +# description="NL-Augmenter: A Framework for Task-Sensitive Natural Language Augmentation", +# author_email="nl-augmenter@googlegroups.com", + +# long_description=read("README.md"), +# long_description_content_type="text/markdown", +# license="MIT", +# url="https://github.com/GEM-benchmark/NL-Augmenter", +# project_urls={ +# "Bug Tracker": "https://github.com/GEM-benchmark/NL-Augmenter/issues", +# "Web Page": "https://gem-benchmark.com/nl_augmenter", +# }, +# install_requires=get_default_requirements(), +# extras_require=get_extra_requirements(), +# keywords=[ +# "augmentation", +# "natural language processing", +# "NLP", +# "filters", +# "deep learning", +# "text processing", +# "machine learning", +# ], +# classifiers=[ +# "License :: OSI Approved :: MIT License", +# "Intended Audience :: Developers", +# "Intended Audience :: Information Technology", +# "Intended Audience :: Science/Research", +# "Programming Language :: Python :: 3", +# "Programming Language :: Python :: 3.7", +# "Operating System :: OS Independent", +# ], +# packages=find_packages(exclude=["test", "docs"]), +# package_data={ +# "": ["*.json", "*.txt", "*.tsv", "*.csv", "*.npz", "*.ckpt"] +# }, +# include_package_data=True, +# python_requires=">=3.7", +# ) From fdf8606b35cbccd4a630b92ca1555f3ba8bed2a2 Mon Sep 17 00:00:00 2001 From: Kimi Li Date: Tue, 31 Jan 2023 16:44:29 -0500 Subject: [PATCH 2/3] fix: uncomment setup --- setup.py | 85 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/setup.py b/setup.py index 12cde3560..a5d017d26 100644 --- a/setup.py +++ b/setup.py @@ -142,46 +142,45 @@ def get_extra_requirements() -> dict: requirements[entry] = filter_requirements(req_string) return requirements -print(get_default_requirements()) - -# setup( -# name=NAME, -# version=__version__, -# description="NL-Augmenter: A Framework for Task-Sensitive Natural Language Augmentation", -# author_email="nl-augmenter@googlegroups.com", - -# long_description=read("README.md"), -# long_description_content_type="text/markdown", -# license="MIT", -# url="https://github.com/GEM-benchmark/NL-Augmenter", -# project_urls={ -# "Bug Tracker": "https://github.com/GEM-benchmark/NL-Augmenter/issues", -# "Web Page": "https://gem-benchmark.com/nl_augmenter", -# }, -# install_requires=get_default_requirements(), -# extras_require=get_extra_requirements(), -# keywords=[ -# "augmentation", -# "natural language processing", -# "NLP", -# "filters", -# "deep learning", -# "text processing", -# "machine learning", -# ], -# classifiers=[ -# "License :: OSI Approved :: MIT License", -# "Intended Audience :: Developers", -# "Intended Audience :: Information Technology", -# "Intended Audience :: Science/Research", -# "Programming Language :: Python :: 3", -# "Programming Language :: Python :: 3.7", -# "Operating System :: OS Independent", -# ], -# packages=find_packages(exclude=["test", "docs"]), -# package_data={ -# "": ["*.json", "*.txt", "*.tsv", "*.csv", "*.npz", "*.ckpt"] -# }, -# include_package_data=True, -# python_requires=">=3.7", -# ) + +setup( + name=NAME, + version=__version__, + description="NL-Augmenter: A Framework for Task-Sensitive Natural Language Augmentation", + author_email="nl-augmenter@googlegroups.com", + + long_description=read("README.md"), + long_description_content_type="text/markdown", + license="MIT", + url="https://github.com/GEM-benchmark/NL-Augmenter", + project_urls={ + "Bug Tracker": "https://github.com/GEM-benchmark/NL-Augmenter/issues", + "Web Page": "https://gem-benchmark.com/nl_augmenter", + }, + install_requires=get_default_requirements(), + extras_require=get_extra_requirements(), + keywords=[ + "augmentation", + "natural language processing", + "NLP", + "filters", + "deep learning", + "text processing", + "machine learning", + ], + classifiers=[ + "License :: OSI Approved :: MIT License", + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + "Intended Audience :: Science/Research", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Operating System :: OS Independent", + ], + packages=find_packages(exclude=["test", "docs"]), + package_data={ + "": ["*.json", "*.txt", "*.tsv", "*.csv", "*.npz", "*.ckpt"] + }, + include_package_data=True, + python_requires=">=3.7", +) From 7d4651daa95c3089dd332c706ae2c8d34c10477c Mon Sep 17 00:00:00 2001 From: Kimi Li Date: Thu, 20 Jul 2023 10:41:58 -0400 Subject: [PATCH 3/3] fix: checklist bad dependency --- requirements-light.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-light.txt b/requirements-light.txt index d11aa674e..49c7eb1f0 100644 --- a/requirements-light.txt +++ b/requirements-light.txt @@ -19,7 +19,7 @@ phonenumbers==8.12.25 datasets==1.7.0 pattern3==3.0.0 allennlp-models==2.5.0 -checklist==0.0.11 +git+https://github.com/decypher-ai/checklist@e6ffe5e148585d0bd377a590d3d46aa58978d83c langid==1.1.6 Babel==2.9.1 word2number==1.1 diff --git a/requirements.txt b/requirements.txt index 02e102e58..3ad8fbd78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -checklist==0.0.11 +git+https://github.com/decypher-ai/checklist@e6ffe5e148585d0bd377a590d3d46aa58978d83c spacy==3.0.0 numpy