Skip to content

Commit 36562ab

Browse files
authored
Merge pull request #58 from CiscoTestAutomation/bastell-discovery_subset
Bastell discovery subset
2 parents cefa7b3 + d3ba883 commit 36562ab

File tree

4 files changed

+190
-145
lines changed

4 files changed

+190
-145
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ install:
2626
@echo "Installing dependencies"
2727
@pip install $(DEPENDENCIES)
2828
@echo "Installing package"
29-
@python setup.py install
29+
@python3 setup.py install
3030
@echo ""
3131
@echo "Done."
3232
@echo ""
@@ -35,15 +35,15 @@ package:
3535
@echo "--------------------------------------------------------------------"
3636
@echo "Building package"
3737
@mkdir -p $(DIST_DIR)/
38-
@python setup.py bdist_wheel --dist-dir=$(DIST_DIR)
38+
@python3 setup.py bdist_wheel --dist-dir=$(DIST_DIR)
3939
@echo ""
4040
@echo "Done."
4141
@echo ""
4242

4343
clean:
4444
@echo ""
4545
@echo "--------------------------------------------------------------------"
46-
@python setup.py clean
46+
@python3 setup.py clean
4747
@echo "Removing *.pyc and __pycache__/ files"
4848
@find . -type f -name "*.pyc" | xargs rm -vrf
4949
@find . -type d -name "__pycache__" | xargs rm -vrf
@@ -60,7 +60,7 @@ develop:
6060
@echo ""
6161
@echo "--------------------------------------------------------------------"
6262
@echo "Setting up development environment"
63-
@python setup.py develop --no-deps -q
63+
@python3 setup.py develop --no-deps -q
6464
@echo ""
6565
@echo "Done."
6666
@echo ""
@@ -69,7 +69,7 @@ undevelop:
6969
@echo ""
7070
@echo "--------------------------------------------------------------------"
7171
@echo "Removing development environment"
72-
@python setup.py develop -q --no-deps --uninstall
72+
@python3 setup.py develop -q --no-deps --uninstall
7373
@echo ""
7474
@echo "Done."
7575
@echo ""

src/pyatsimagebuilder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
from .builder import ImageBuilder
33

44
# metadata
5-
__version__ = '24.7'
5+
__version__ = '24.7.2'
66
__author__ = 'Cisco Systems Inc.'

src/pyatsimagebuilder/context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ def __init__(self,
1919
self.path = None
2020
self.keep = keep
2121

22-
def mkdir(self, name):
22+
def mkdir(self, name, exist_ok=False):
2323
'''
2424
create a folder in this build context
2525
'''
2626
folder = self.path / name
27-
folder.mkdir()
27+
folder.mkdir(parents=True, exist_ok=exist_ok)
2828
return folder.relative_to(self.path)
2929

3030
def write_file(self, file, content):

0 commit comments

Comments
 (0)