Merge pull request #7 from jdavcs/main_package_dag_process

Ignore empty lines, comments when reading in packages_by_dep_dag.txt file

galaxy_release_util/point_release.py

@@ -117,8 +117,8 @@ def __repr__(self) -> str:
 def get_sorted_package_paths(galaxy_root: pathlib.Path) -> List[pathlib.Path]:
     root_package_path = galaxy_root.joinpath("packages")
     sorted_packages = root_package_path.joinpath("packages_by_dep_dag.txt").read_text().splitlines()
-    # Check that all packages are listed in packages_by_dep_dag.txt ?
-    return [root_package_path.joinpath(package) for package in sorted_packages]
+    # Ignore empty lines and lines beginning with "#"
+    return [root_package_path.joinpath(p) for p in sorted_packages if p and not p.startswith("#")]
 
 
 def read_package(package_path: pathlib.Path) -> Package:

tests/test_release.py

@@ -5,19 +5,32 @@
 from galaxy_release_util.point_release import (
     get_next_devN_version,
     get_root_version,
+    get_sorted_package_paths,
 )
 
 VERSION_PY_CONTENTS = """VERSION_MAJOR = "23.0"
 VERSION_MINOR = "2"
 VERSION = VERSION_MAJOR + (f".{VERSION_MINOR}" if VERSION_MINOR else "")
 """
 
+PACKAGES_BY_DEP_DAG_CONTENTS = """
+foo
+
+bar
+#this is a comment
+baz
+"""
+
+
+def write_contents(path: pathlib.Path, contents: str):
+    path.parent.mkdir(parents=True)
+    path.write_text(contents)
+
 
 @pytest.fixture()
 def galaxy_root(tmp_path: pathlib.Path):
-    version_py = tmp_path / "lib" / "galaxy" / "version.py"
-    version_py.parent.mkdir(parents=True)
-    version_py.write_text(VERSION_PY_CONTENTS)
+    write_contents(tmp_path / "lib" / "galaxy" / "version.py", VERSION_PY_CONTENTS)
+    write_contents(tmp_path / "packages" / "packages_by_dep_dag.txt", PACKAGES_BY_DEP_DAG_CONTENTS)
     return tmp_path
 
 
@@ -35,3 +48,11 @@ def test_get_next_devN_version(galaxy_root):
     assert version.minor == 0
     assert version.micro == 3
     assert version.dev == 0
+
+
+def test_get_sorted_package_paths(galaxy_root):
+    packages = get_sorted_package_paths(galaxy_root)
+    assert len(packages) == 3
+    assert packages[0].name == "foo"
+    assert packages[1].name == "bar"
+    assert packages[2].name == "baz"