Packaging fixed to now ship default style

hyakuhei · Apr 27, 2021 · dc396d1 · dc396d1
1 parent 913b0df
commit dc396d1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include etc/stlye.json
+include conf/*.json
diff --git a/src/attacktree/__init__.py → attacktree/__init__.py b/src/attacktree/__init__.py → attacktree/__init__.py
diff --git a/src/attacktree/models.py → attacktree/models.py b/src/attacktree/models.py → attacktree/models.py
diff --git a/src/attacktree/renderer.py → attacktree/renderer.py b/src/attacktree/renderer.py → attacktree/renderer.py
@@ -84,7 +84,7 @@ def render(self, renderUnimplemented: bool=True, style: dict={}, fname: str="Att
 
         if len(style) == 0: #TODO: Make this a better check
             with resources.open_text("attacktree", "style.json") as fid:
-                style = json.loads(fid)
+                style = json.load(fid)
 
         self._buildDot(self.root, dot, dotformat=style, renderUnimplemented=renderUnimplemented) #recursive call
         dot.format = fout

diff --git a/etc/style.json → conf/style.json b/etc/style.json → conf/style.json
diff --git a/rebuild.sh b/rebuild.sh
@@ -1,3 +1,4 @@
+rm -rf attacktree.egg-info
 rm -rf build
 rm -rf dist
 python3 -m build

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = attacktree
-version = 0.0.16
+version = 0.0.162
 author = hyakuhei
 author_email = hyakuhei@gmail.com
 summary = Build, analyize and render attack trees
@@ -14,16 +14,13 @@ classifiers =
     Operating System :: OS Independent
 
 [options]
-package_dir =
-    = src
+include_package_date = True
 packages = find:
 python_requires = >=3.7
 install_requires =
 	graphviz >=0.16
-include_package_data = true
 
 [options.packages.find]
-where = src
 exclude =
 	build*
 	dist*

diff --git a/setup.py b/setup.py
@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()