Skip to content

Commit 679f74c

Browse files
gryfEmilienM
authored andcommitted
Provided packaging for dsal tools.
1 parent deadf60 commit 679f74c

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

tools/dsal/MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
graft dsal_helper/templates
2+
exclude .gitignore

tools/dsal/dsal_helper/dsal_helper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self):
3030

3131
parser = self._get_arg_parser()
3232
args = parser.parse_args()
33-
self._prepare_jinja()
33+
self._setup_jinja()
3434
if hasattr(args, 'func'):
3535
try:
3636
self._setup_openstack(args.cloud)
@@ -42,9 +42,9 @@ def __init__(self):
4242
parser.print_help()
4343
parser.exit()
4444

45-
def _prepare_jinja(self):
45+
def _setup_jinja(self):
4646
self.jinja = jinja2.Environment(
47-
loader=jinja2.FileSystemLoader("templates"))
47+
loader=jinja2.PackageLoader('dsal_helper'))
4848

4949
def _get_arg_parser(self):
5050
parser = argparse.ArgumentParser(
File renamed without changes.

tools/dsal/templates/local-overrides-16.2.yaml.tpl renamed to tools/dsal/dsal_helper/templates/local-overrides-16.2.yaml.tpl

File renamed without changes.

tools/dsal/pyproject.toml

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

tools/dsal/setup.cfg

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ classifiers =
1111
Operating System :: OS Independent
1212

1313
[options]
14-
package_dir =
15-
= .
1614
packages = find:
17-
python_requires = >=3.6
1815
include_package_data = True
19-
20-
[options.package_data]
21-
* = *.tpl
22-
23-
[options.packages.find]
24-
where = .
16+
install_requires =
17+
jinja2
18+
netaddr
19+
openstacksdk
2520

2621
[options.entry_points]
2722
console_scripts =
2823
dsal-helper = dsal_helper.dsal_helper:main
24+
25+
[options.package_data]
26+
* = *.tpl

tools/dsal/setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import setuptools
2+
3+
4+
setuptools.setup()

0 commit comments

Comments
 (0)