From 252bf1d80aaa67d5f48c06140dafc2ffc8e370ee Mon Sep 17 00:00:00 2001 From: changchiyou Date: Thu, 9 May 2024 15:52:34 +0800 Subject: [PATCH 1/2] chore: update `requirements.txt`&`pyproject.toml` for `typing-extensions` mainly --- .gitignore | 3 +- pyproject.toml | 86 ++++++++++++++++++++++++++---------------------- requirements.txt | 1 + 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index b933e13..58b95a5 100755 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ nosetests.xml .project .pydevproject venv +.venv .vscode # Ruff cache @@ -52,4 +53,4 @@ venv _docs tests/localdebug requirements_poetry.txt -tmp +tmp \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 86b4a5c..48920c7 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,22 +5,20 @@ description = "Simplified python article discovery & extraction." authors = ["Andrei Paraschiv "] license = "MIT" readme = "README.md" -packages = [ - {include = "newspaper"}, -] +packages = [{ include = "newspaper" }] keywords = ["nlp", "scraping", "newspaper", "article", "curation", "extraction"] classifiers = [ - "Development Status :: 4 - Beta", - "Programming Language :: Python :: 3", - "Natural Language :: English", - "Topic :: Text Processing", - "Topic :: Text Processing :: Markup :: HTML", - "Topic :: Software Development :: Libraries :: Python Modules", - "Intended Audience :: Developers", - "Intended Audience :: Education", - "Intended Audience :: Information Technology", - "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", + "Development Status :: 4 - Beta", + "Programming Language :: Python :: 3", + "Natural Language :: English", + "Topic :: Text Processing", + "Topic :: Text Processing :: Markup :: HTML", + "Topic :: Software Development :: Libraries :: Python Modules", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Information Technology", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", ] homepage = "https://github.com/AndyTheFactory/newspaper4k" repository = "https://github.com/AndyTheFactory/newspaper4k" @@ -31,28 +29,29 @@ python = "^3.8" beautifulsoup4 = ">=4.9.3" Pillow = ">=4.0.0" PyYAML = ">=5.1" -lxml = ">=4.2.0" +lxml = ">=4.2.0,<5.2.0" nltk = ">=3.6.6" requests = ">=2.26.0" feedparser = ">=6.0.0" tldextract = ">=2.0.1" python-dateutil = ">=2.6.1" numpy = [ - { version = ">=1.25", python = ">=3.11", optional = true}, - { version = "^1.24", python = ">=3.8, <3.11", optional = true} + { version = ">=1.25", python = ">=3.11", optional = true }, + { version = "^1.24", python = ">=3.8, <3.11", optional = true }, ] pandas = [ - {version = ">=2.1.0", optional = true, python = ">=3.11"}, - {version = ">=1.4", optional = true, python = ">=3.8, <3.11"} + { version = ">=2.1.0", optional = true, python = ">=3.11" }, + { version = ">=1.4", optional = true, python = ">=3.8, <3.11" }, ] +typing-extensions = ">=4.10.0" # Language specific dependencies -tinysegmenter = {version = ">=0.4", optional = true} -pythainlp = {version = ">=2.3.2", optional = true} -jieba = {version = ">=0.42.1", optional = true} -indic-nlp-library = {version = ">=0.90", optional = true} -cloudscraper = {version = ">=1.2.0", optional = true} -gnews = {version = ">=0.3.6", optional = true} +tinysegmenter = { version = ">=0.4", optional = true } +pythainlp = { version = ">=2.3.2", optional = true } +jieba = { version = ">=0.42.1", optional = true } +indic-nlp-library = { version = ">=0.90", optional = true } +cloudscraper = { version = ">=1.2.0", optional = true } +gnews = { version = ">=0.3.6", optional = true } [tool.poetry.extras] zh = ["jieba"] @@ -64,26 +63,33 @@ np = ["indic-nlp-library"] ta = ["indic-nlp-library"] cloudflare = ["cloudscraper"] gnews = ["gnews"] -all = ["tinysegmenter", "pythainlp", "jieba", "indic-nlp-library","cloudscraper","gnews"] +all = [ + "tinysegmenter", + "pythainlp", + "jieba", + "indic-nlp-library", + "cloudscraper", + "gnews", +] [tool.poetry.group.dev.dependencies] -coverage = {version = ">=7.3.2", python = "^3.8"} -pre-commit = {version = ">=3.5.0", python = "^3.8"} -ruff = {version = ">=0.1.2", python = "^3.8"} -codespell = {version = ">=2.2.6 ", python = "^3.8"} -pytest = {version = ">=7.0.0", python = "^3.8"} -mypy = {version="^1.8.0", python="^3.8"} -lxml-stubs = {version = "^0.5.1", python = "^3.8"} -types-pillow = {version = "^10.2.0.20240213", python = "^3.8"} -types-python-dateutil = {version = "^2.8.19.20240106", python = "^3.8"} +coverage = { version = ">=7.3.2", python = "^3.8" } +pre-commit = { version = ">=3.5.0", python = "^3.8" } +ruff = { version = ">=0.1.2", python = "^3.8" } +codespell = { version = ">=2.2.6 ", python = "^3.8" } +pytest = { version = ">=7.0.0", python = "^3.8" } +mypy = { version = "^1.8.0", python = "^3.8" } +lxml-stubs = { version = "^0.5.1", python = "^3.8" } +types-pillow = { version = "^10.2.0.20240213", python = "^3.8" } +types-python-dateutil = { version = "^2.8.19.20240106", python = "^3.8" } types-requests = "^2.27.1" -types-beautifulsoup4 = {version = "^4.12.0.20240106", python = "^3.8"} -virtualenv = {version = ">=20.25.1"} +types-beautifulsoup4 = { version = "^4.12.0.20240106", python = "^3.8" } +virtualenv = { version = ">=20.25.1" } [tool.poetry.group.docs.dependencies] -sphinx = {version = ">=7.0.0", python = "^3.8"} -sphinx-argparse = {version = "*", python = "^3.8"} -sphinx-rtd-theme = {version = ">=1.3.0", python = "^3.8"} +sphinx = { version = ">=7.0.0", python = "^3.8" } +sphinx-argparse = { version = "*", python = "^3.8" } +sphinx-rtd-theme = { version = ">=1.3.0", python = "^3.8" } [build-system] requires = ["poetry-core"] diff --git a/requirements.txt b/requirements.txt index 4a9df00..853e102 100755 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,4 @@ tinysegmenter==0.4 ; python_version >= "3.8" and python_version < "4.0" tldextract==3.1.2 ; python_version >= "3.8" and python_version < "4.0" tqdm==4.64.1 ; python_version >= "3.8" and python_version < "4.0" urllib3==1.26.18 ; python_version >= "3.8" and python_version < "4.0" +typing-extensions==4.10.0 ; python_version >= "3.8" and python_version < "4.0" \ No newline at end of file From 32d9b56c514de409062ebd178158a06875ac40d3 Mon Sep 17 00:00:00 2001 From: changchiyou Date: Thu, 9 May 2024 16:27:21 +0800 Subject: [PATCH 2/2] style: following the coding style before this commit is for `pre-commit` mainly --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 48920c7..ca0a79e 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ python = "^3.8" beautifulsoup4 = ">=4.9.3" Pillow = ">=4.0.0" PyYAML = ">=5.1" -lxml = ">=4.2.0,<5.2.0" +lxml = ">=4.2.0, <5.2.0" nltk = ">=3.6.6" requests = ">=2.26.0" feedparser = ">=6.0.0"