Resolved merge conflicts

.github/workflows/publish.yml

@@ -4,13 +4,15 @@ on:
   push:
     branches:
       - main
+    tags:
+      - 'v*'
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10"]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/python-package.yml

@@ -5,9 +5,9 @@ name: Python package
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
 
 jobs:
   build:

sct/sct.py

@@ -34,7 +34,6 @@ def init_pipeline(self):
             self.pipeline.append(self.fix_bad_unicode)
         if config.CHECK_TO_ASCII_UNICODE:
             self.pipeline.append(self.to_ascii_unicode)
-
         if config.CHECK_REPLACE_HTML:
             self.pipeline.append(self.replace_html)
         if config.CHECK_REPLACE_URLS:

tests/test_sct.py

@@ -15,10 +15,13 @@
 from contextlib import contextmanager
 from sct.sct import TextCleaner
 from sct.utils import ner
+import os
 
 def requires_ner(func):
     @wraps(func)
     def wrapper(self, *args, **kwargs):
+        if os.getenv('GITHUB_ACTIONS'):
+            self.skipTest("Skipping NER tests in GitHub Actions")
         if not hasattr(self.ner, 'en_model'):
             self.skipTest("NER models not properly loaded")
         return func(self, *args, **kwargs)
@@ -55,6 +58,10 @@ class TextCleanerTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        if os.getenv('GITHUB_ACTIONS'):
+            cls.ner = None
+            return
+
         try:
             with timeout(1200):  # 20 minute timeout
                 config.CHECK_NER_PROCESS = False
@@ -158,7 +165,6 @@ def test_faker_url(self, fkw):
         self.assertEqual(clean_url, fkw)
 
     @requires_ner
-    @settings(deadline=None)
     def test_ner_process_basic(self):
         """Test basic NER processing with known entities."""
         text = "John Smith works at Microsoft in New York."