ok-script 2.0.0b6__tar.gz → 2.0.0b7__tar.gz

{ok_script-2.0.0b6/ok_script.egg-info → ok_script-2.0.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.0b6
+Version: 2.0.0b7
 Summary: Automation with Computer Vision for Python
 Author-email: ok-oldking <firedcto@gmail.com>
 Project-URL: Homepage, https://github.com/ok-oldking/ok-script

{ok_script-2.0.0b6 → ok_script-2.0.0b7}/ok/update/inline_ok_requirements.py

@@ -1,4 +1,5 @@
 import argparse
+import glob
 import os
 import re
 
@@ -31,19 +32,6 @@ def _deploy_includes_folder(deploy_entries, folder):
     return any(entry == folder or entry.startswith(f'{folder}/') for entry in deploy_entries)
 
 
-def _get_inlined_requirement_folders(repo_dir, inlined_requirements=None):
-    if inlined_requirements is None:
-        inlined_requirements = INLINED_REQUIREMENTS
-    deploy_entries = _read_deploy_entries(repo_dir)
-    if not deploy_entries:
-        return []
-    return [
-        package_folder
-        for package_folder in inlined_requirements.values()
-        if _deploy_includes_folder(deploy_entries, package_folder)
-    ]
-
-
 def _add_folders_to_deploy(repo_dir, folders):
     deploy_file = os.path.join(repo_dir, 'deploy.txt')
     deploy_entries = _read_deploy_entries(repo_dir)
@@ -92,13 +80,29 @@ def inline_site_packages(repo_dir, package_folders=None):
             raise RuntimeError(f'Failed to inline {package_folder} from site-packages')
 
 
+def _remove_inlined_requirements(repo_dir, package_names):
+    package_names = tuple(package_names)
+    if not package_names:
+        return
+    requirement_pattern = re.compile(
+        r'^\s*({})\b'.format('|'.join(re.escape(name) for name in package_names)),
+        re.IGNORECASE,
+    )
+    for file_path in glob.glob(os.path.join(repo_dir, 'requirements*.txt')):
+        with open(file_path, 'r', encoding='utf-8') as file:
+            lines = file.readlines()
+        filtered_lines = [line for line in lines if not requirement_pattern.match(line)]
+        with open(file_path, 'w', encoding='utf-8') as file:
+            file.writelines(filtered_lines)
+
+
 def remove_ok_requirements(repo_dir, tag, additional_inlined_requirements=None):
     inlined_requirements = dict(INLINED_REQUIREMENTS)
     if additional_inlined_requirements:
         inlined_requirements.update(additional_inlined_requirements)
-        _add_folders_to_deploy(repo_dir, additional_inlined_requirements.values())
 
-    package_folders = _get_inlined_requirement_folders(repo_dir, inlined_requirements)
+    package_folders = inlined_requirements.values()
+    _add_folders_to_deploy(repo_dir, package_folders)
     inline_site_packages(repo_dir, package_folders)
 
     config_file = get_file_in_path_or_cwd(repo_dir, 'config.py')
@@ -108,25 +112,12 @@ def remove_ok_requirements(repo_dir, tag, additional_inlined_requirements=None):
     with open(config_file, 'w', encoding='utf-8') as file:
         file.write(new_content)
 
-    file_path = os.path.join(repo_dir, 'requirements.txt')
-    with open(file_path, 'r', encoding='utf-8') as file:
-        lines = file.readlines()
-    inlined_packages = [
-        package_name
-        for package_name, package_folder in inlined_requirements.items()
-        if package_folder in package_folders
-    ]
-    if inlined_packages:
-        requirement_pattern = r'^\s*({})\b'.format('|'.join(re.escape(name) for name in inlined_packages))
-        filtered_lines = [line for line in lines if not re.match(requirement_pattern, line, re.IGNORECASE)]
-    else:
-        filtered_lines = lines
-    with open(file_path, 'w', encoding='utf-8') as file:
-        file.writelines(filtered_lines)
+    _remove_inlined_requirements(repo_dir, inlined_requirements.keys())
+
 
 def main(argv=None):
     parser = argparse.ArgumentParser(description='Inline deployment requirements.')
-    parser.add_argument('--tag', help='Set the application version and remove inlined packages from requirements.txt.')
+    parser.add_argument('--tag', help='Set the application version and remove inlined packages from requirements files.')
     parser.add_argument(
         '--add-inlined-requirement',
         action='append',
@@ -145,7 +136,7 @@ def main(argv=None):
     else:
         inlined_requirements = dict(INLINED_REQUIREMENTS)
         inlined_requirements.update(additional_inlined_requirements)
-        _add_folders_to_deploy(repo_dir, additional_inlined_requirements.values())
+        _add_folders_to_deploy(repo_dir, inlined_requirements.values())
         inline_site_packages(repo_dir, inlined_requirements.values())
 
 

{ok_script-2.0.0b6 → ok_script-2.0.0b7/ok_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.0b6
+Version: 2.0.0b7
 Summary: Automation with Computer Vision for Python
 Author-email: ok-oldking <firedcto@gmail.com>
 Project-URL: Homepage, https://github.com/ok-oldking/ok-script

{ok_script-2.0.0b6 → ok_script-2.0.0b7}/tests/test_inline_ok_requirements.py

@@ -11,9 +11,17 @@ def _write_repo_files(repo_dir, deploy_text=None):
         (repo_dir / "deploy.txt").write_text(deploy_text, encoding="utf-8")
 
 
-def test_remove_ok_requirements_skips_inline_and_removal_without_deploy_txt(tmp_path, monkeypatch):
+def test_remove_ok_requirements_always_includes_defaults_without_deploy_txt(tmp_path, monkeypatch):
     copied_folders = []
     _write_repo_files(tmp_path)
+    (tmp_path / "requirements-web.txt").write_text(
+        "ok-script==1.0.147\npyappify==1.0.3\nhttpx==0.28.1\n",
+        encoding="utf-8",
+    )
+    (tmp_path / "requirements-dev.txt").write_text(
+        "PYAPPIFY==1.0.3\npytest==8.4.1\n",
+        encoding="utf-8",
+    )
     monkeypatch.setattr(
         inline_ok_requirements,
         "find_and_copy_site_package",
@@ -22,14 +30,21 @@ def test_remove_ok_requirements_skips_inline_and_removal_without_deploy_txt(tmp_
 
     inline_ok_requirements.remove_ok_requirements(str(tmp_path), "v1.2.3")
 
-    assert copied_folders == []
+    assert copied_folders == ["ok", "pyappify"]
     assert (tmp_path / "requirements.txt").read_text(encoding="utf-8") == (
-        "ok-script==1.0.147\npyappify==1.0.3\nrequests==2.32.3\n"
+        "requests==2.32.3\n"
+    )
+    assert (tmp_path / "requirements-web.txt").read_text(encoding="utf-8") == (
+        "httpx==0.28.1\n"
     )
+    assert (tmp_path / "requirements-dev.txt").read_text(encoding="utf-8") == (
+        "pytest==8.4.1\n"
+    )
+    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == "ok\npyappify\n"
     assert (tmp_path / "config.py").read_text(encoding="utf-8") == 'version = "v1.2.3"\n'
 
 
-def test_remove_ok_requirements_only_inlines_folders_listed_in_deploy_txt(tmp_path, monkeypatch):
+def test_remove_ok_requirements_adds_missing_defaults_to_deploy_txt(tmp_path, monkeypatch):
     copied_folders = []
     _write_repo_files(tmp_path, "src\nok\nrequirements.txt\n")
     monkeypatch.setattr(
@@ -40,9 +55,12 @@ def test_remove_ok_requirements_only_inlines_folders_listed_in_deploy_txt(tmp_pa
 
     inline_ok_requirements.remove_ok_requirements(str(tmp_path), "v1.2.3")
 
-    assert copied_folders == ["ok"]
+    assert copied_folders == ["ok", "pyappify"]
     assert (tmp_path / "requirements.txt").read_text(encoding="utf-8") == (
-        "pyappify==1.0.3\nrequests==2.32.3\n"
+        "requests==2.32.3\n"
+    )
+    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == (
+        "src\nok\nrequirements.txt\npyappify\n"
     )
 
 
@@ -57,10 +75,11 @@ def test_remove_ok_requirements_matches_deploy_subpaths(tmp_path, monkeypatch):
 
     inline_ok_requirements.remove_ok_requirements(str(tmp_path), "v1.2.3")
 
-    assert copied_folders == ["pyappify"]
+    assert copied_folders == ["ok", "pyappify"]
     assert (tmp_path / "requirements.txt").read_text(encoding="utf-8") == (
-        "ok-script==1.0.147\nrequests==2.32.3\n"
+        "requests==2.32.3\n"
     )
+    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == "pyappify/main.py\nok\n"
 
 
 def test_additional_inlined_requirement_is_added_to_deploy_and_removed(tmp_path, monkeypatch):
@@ -82,8 +101,10 @@ def test_additional_inlined_requirement_is_added_to_deploy_and_removed(tmp_path,
         "custom-package=custom_package",
     ])
 
-    assert copied_folders == ["custom_package"]
-    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == "src\ncustom_package\n"
+    assert copied_folders == ["ok", "pyappify", "custom_package"]
+    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == (
+        "src\nok\npyappify\ncustom_package\n"
+    )
     assert "custom-package" not in (tmp_path / "requirements.txt").read_text(encoding="utf-8")
 
 
@@ -104,5 +125,7 @@ def test_additional_inlined_requirement_does_not_duplicate_deploy_subpath(tmp_pa
         {"custom-package": "custom_package"},
     )
 
-    assert copied_folders == ["custom_package"]
-    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == "custom_package/main.py\n"
+    assert copied_folders == ["ok", "pyappify", "custom_package"]
+    assert (tmp_path / "deploy.txt").read_text(encoding="utf-8") == (
+        "custom_package/main.py\nok\npyappify\n"
+    )