forked from pool/python-nltk
		
	Accepting request 1218969 from home:dgarcia:branches:devel:languages:python
- Remove nltk_data to avoid redistribution of files with non-commercial (boo#1232448): > NLTK corpora are provided under the terms given in the README file > for each corpus; all are redistributable and available for > non-commercial use. - Remove not needed skip-networked-test.patch OBS-URL: https://build.opensuse.org/request/show/1218969 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nltk?expand=0&rev=56
This commit is contained in:
		@@ -1,3 +0,0 @@
 | 
				
			|||||||
version https://git-lfs.github.com/spec/v1
 | 
					 | 
				
			||||||
oid sha256:d5996129d40c2598664f74f44c15a39059f5b3713a26152ad4b0220d37bf6f9d
 | 
					 | 
				
			||||||
size 392736120
 | 
					 | 
				
			||||||
@@ -1,3 +1,13 @@
 | 
				
			|||||||
 | 
					-------------------------------------------------------------------
 | 
				
			||||||
 | 
					Tue Oct 29 08:37:43 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Remove nltk_data to avoid redistribution of files with
 | 
				
			||||||
 | 
					  non-commercial (boo#1232448):
 | 
				
			||||||
 | 
					  > NLTK corpora are provided under the terms given in the README file
 | 
				
			||||||
 | 
					  > for each corpus; all are redistributable and available for
 | 
				
			||||||
 | 
					  > non-commercial use.
 | 
				
			||||||
 | 
					- Remove not needed skip-networked-test.patch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-------------------------------------------------------------------
 | 
					-------------------------------------------------------------------
 | 
				
			||||||
Mon Sep 30 21:17:21 UTC 2024 - Thiago Bertoldi <thiago.bertoldi@suse.com>
 | 
					Mon Sep 30 21:17:21 UTC 2024 - Thiago Bertoldi <thiago.bertoldi@suse.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -57,11 +57,12 @@ Source0:        https://github.com/nltk/%{modname}/archive/refs/tags/%{version}.
 | 
				
			|||||||
#     tar -cJf ../nltk_data.tar.xz nltk_data
 | 
					#     tar -cJf ../nltk_data.tar.xz nltk_data
 | 
				
			||||||
#     popd
 | 
					#     popd
 | 
				
			||||||
# see https://www.nltk.org/data.html for more details
 | 
					# see https://www.nltk.org/data.html for more details
 | 
				
			||||||
Source1:        nltk_data.tar.xz
 | 
					########### NOTICE #########
 | 
				
			||||||
 | 
					# Do not distribute nltk_data.tar.xz because it's licensed under
 | 
				
			||||||
 | 
					# non-commercial, boo#1232448
 | 
				
			||||||
 | 
					############################
 | 
				
			||||||
 | 
					# Source1:        nltk_data.tar.xz
 | 
				
			||||||
Source99:       python-nltk.rpmlintrc
 | 
					Source99:       python-nltk.rpmlintrc
 | 
				
			||||||
# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#nltk/nltk#2969 mcepl@suse.com
 | 
					 | 
				
			||||||
# skip tests requiring network connection
 | 
					 | 
				
			||||||
Patch0:         skip-networked-test.patch
 | 
					 | 
				
			||||||
BuildRequires:  %{python_module base >= 3.7}
 | 
					BuildRequires:  %{python_module base >= 3.7}
 | 
				
			||||||
BuildRequires:  %{python_module pip}
 | 
					BuildRequires:  %{python_module pip}
 | 
				
			||||||
BuildRequires:  %{python_module setuptools}
 | 
					BuildRequires:  %{python_module setuptools}
 | 
				
			||||||
@@ -118,7 +119,7 @@ Python modules, data sets and tutorials supporting research and
 | 
				
			|||||||
development in Natural Language Processing.
 | 
					development in Natural Language Processing.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%prep
 | 
					%prep
 | 
				
			||||||
%setup -q -a1 -n %{modname}-%{version}
 | 
					%setup -q -n %{modname}-%{version}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Fix EOL
 | 
					# Fix EOL
 | 
				
			||||||
sed -i 's/\r/\n/g; s/\n$//' \
 | 
					sed -i 's/\r/\n/g; s/\n$//' \
 | 
				
			||||||
@@ -162,15 +163,16 @@ sed -E -i "s|#![[:space:]]*%{_bindir}/env python|#!%{_bindir}/python3|" \
 | 
				
			|||||||
chmod -x %{buildroot}%{$python_sitelib}/nltk/test/dependency.doctest
 | 
					chmod -x %{buildroot}%{$python_sitelib}/nltk/test/dependency.doctest
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%check
 | 
					# Do not test, there's no ntlk_data, boo#1232448
 | 
				
			||||||
export NLTK_DATA=$(readlink -f ./nltk_data/)
 | 
					# %%check
 | 
				
			||||||
# export PYTEST_ADDOPTS="--doctest-modules"
 | 
					# export NLTK_DATA=$(readlink -f ./nltk_data/)
 | 
				
			||||||
# Skip tests requiring pickle.load gh#nltk/nltk#3266 (CVE-2024-39705)
 | 
					# # export PYTEST_ADDOPTS="--doctest-modules"
 | 
				
			||||||
skip_tests=" or test_basic or test_increment or test_pad_asterisk or test_pad_dotdot"
 | 
					# # Skip tests requiring pickle.load gh#nltk/nltk#3266 (CVE-2024-39705)
 | 
				
			||||||
skip_tests+=" or test_pos_tag_eng or test_pos_tag_eng_universal or test_pos_tag_rus"
 | 
					# skip_tests=" or test_basic or test_increment or test_pad_asterisk or test_pad_dotdot"
 | 
				
			||||||
skip_tests+=" or test_pos_tag_rus_universal or test_pos_tag_unknown_lang"
 | 
					# skip_tests+=" or test_pos_tag_eng or test_pos_tag_eng_universal or test_pos_tag_rus"
 | 
				
			||||||
skip_tests+=" or test_sent_tokenize or test_unspecified_lang or test_word_tokenize"
 | 
					# skip_tests+=" or test_pos_tag_rus_universal or test_pos_tag_unknown_lang"
 | 
				
			||||||
%pytest -k "not (network ${skip_tests})"
 | 
					# skip_tests+=" or test_sent_tokenize or test_unspecified_lang or test_word_tokenize"
 | 
				
			||||||
 | 
					# %%pytest -k "not (network ${skip_tests})"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%post
 | 
					%post
 | 
				
			||||||
%python_install_alternative nltk
 | 
					%python_install_alternative nltk
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,36 +0,0 @@
 | 
				
			|||||||
---
 | 
					 | 
				
			||||||
 nltk/test/unit/test_downloader.py |    4 ++++
 | 
					 | 
				
			||||||
 setup.cfg                         |    4 ++++
 | 
					 | 
				
			||||||
 2 files changed, 8 insertions(+)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
--- a/nltk/test/unit/test_downloader.py
 | 
					 | 
				
			||||||
+++ b/nltk/test/unit/test_downloader.py
 | 
					 | 
				
			||||||
@@ -1,6 +1,9 @@
 | 
					 | 
				
			||||||
 from nltk import download
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+import pytest
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+@pytest.mark.network
 | 
					 | 
				
			||||||
 def test_downloader_using_existing_parent_download_dir(tmp_path):
 | 
					 | 
				
			||||||
     """Test that download works properly when the parent folder of the download_dir exists"""
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
@@ -9,6 +12,7 @@ def test_downloader_using_existing_paren
 | 
					 | 
				
			||||||
     assert download_status is True
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+@pytest.mark.network
 | 
					 | 
				
			||||||
 def test_downloader_using_non_existing_parent_download_dir(tmp_path):
 | 
					 | 
				
			||||||
     """Test that download works properly when the parent folder of the download_dir does not exist"""
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
--- a/setup.cfg
 | 
					 | 
				
			||||||
+++ b/setup.cfg
 | 
					 | 
				
			||||||
@@ -1,3 +1,7 @@
 | 
					 | 
				
			||||||
+[tool:pytest]
 | 
					 | 
				
			||||||
+markers =
 | 
					 | 
				
			||||||
+   network: test case requires network connection
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 [metadata]
 | 
					 | 
				
			||||||
 license_files =
 | 
					 | 
				
			||||||
     LICENSE.txt
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user