Skip to content

Commit a191279

Browse files
committed
Remove deprecated code structure located under python_gardenlinux_lib
Signed-off-by: Tobias Wolf <[email protected]>
1 parent 835fdb8 commit a191279

File tree

22 files changed

+22
-1576
lines changed

22 files changed

+22
-1576
lines changed

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import sys
33

44
sys.path.insert(0, os.path.abspath("../src"))
5-
import python_gardenlinux_lib
65

76

87
# Configuration file for the Sphinx documentation builder.

docs/index.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@
44
contain the root `toctree` directive.
55
66
python-gardenlinux-lib documentation
7-
================================
8-
.. automodule:: python_gardenlinux_lib.parse_features
7+
====================================
8+
.. automodule:: gardenlinux
99
:members:
10-
.. automodule:: python_gardenlinux_lib.package_repo_info
10+
.. automodule:: gardenlinux.apt
11+
:members:
12+
.. automodule:: gardenlinux.features
13+
:members:
14+
.. automodule:: gardenlinux.flavors
15+
:members:
16+
.. automodule:: gardenlinux.git
17+
:members:
18+
.. automodule:: gardenlinux.oci
1119
:members:
1220
.. toctree::
13-
:maxdepth: 2
21+
:maxdepth: 3
1422
:caption: Contents:
1523

1624
Indices and tables

pyproject.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Contains tools to work with the features directory of gardenlinux
55
authors = ["Garden Linux Maintainers <[email protected]>"]
66
license = "Apache-2.0"
77
readme = "README.md"
8-
packages = [{include = "gardenlinux", from="src"}, {include = "python_gardenlinux_lib", from="src"}]
8+
packages = [{include = "gardenlinux", from="src"}]
99

1010
[tool.poetry.dependencies]
1111
python = "^3.13"
@@ -21,12 +21,10 @@ cryptography = "^44.0.0"
2121
boto3 = "*"
2222
click = "^8.2.0"
2323
pygments = "^2.19.1"
24-
opencontainers = "^0.0.14"
2524

2625
[tool.poetry.group.dev.dependencies]
2726
bandit = "^1.8.3"
2827
black = "^24.8.0"
29-
opencontainers = "^0.0.14"
3028

3129
[tool.poetry.group.docs.dependencies]
3230
sphinx-rtd-theme = "^2.0.0"
@@ -36,7 +34,6 @@ gl-cname = "gardenlinux.features.cname_main:main"
3634
gl-features-parse = "gardenlinux.features.__main__:main"
3735
gl-flavors-parse = "gardenlinux.flavors.__main__:main"
3836
gl-oci = "gardenlinux.oci.__main__:main"
39-
flavors-parse = "gardenlinux.flavors.__main__:main"
4037

4138
[tool.pytest.ini_options]
4239
pythonpath = ["src"]

src/gardenlinux/flavors/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# -*- coding: utf-8 -*-
33

44
from argparse import ArgumentParser
5-
from git import Git
65
import json
76
import os
87
import sys
98

9+
from ..git import Git
10+
1011
from .parser import Parser
1112

1213

@@ -93,8 +94,7 @@ def parse_args():
9394
def main():
9495
args = parse_args()
9596

96-
repo_path = Git(".").rev_parse("--show-superproject-working-tree")
97-
flavors_file = os.path.join(repo_path, "flavors.yaml")
97+
flavors_file = os.path.join(Git().root, "flavors.yaml")
9898

9999
if not os.path.isfile(flavors_file):
100100
sys.exit(f"Error: {flavors_file} does not exist.")

src/python_gardenlinux_lib/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/python_gardenlinux_lib/features/__init__.py

Whitespace-only changes.

src/python_gardenlinux_lib/features/package_repo_info.py

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)