diff --git a/src/python/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from src/python/CHANGELOG.md rename to CHANGELOG.md diff --git a/archlens.json b/archlens.json index c3b6d5e2..71294d7b 100644 --- a/archlens.json +++ b/archlens.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/archlens/ArchLens/master/src/python/config.schema.json", + "$schema": "https://raw.githubusercontent.com/archlens/ArchLens/master/src/python/src/config.schema.json", "name": "ArchLens", "rootFolder": "src/python/src", "github": { diff --git a/src/python/setup.py b/src/python/setup.py index 0a848bcd..41bbbc69 100644 --- a/src/python/setup.py +++ b/src/python/setup.py @@ -1,12 +1,12 @@ -from setuptools import setup, find_packages, glob +from setuptools import setup, find_packages import os # Read README for long description here = os.path.abspath(os.path.dirname(__file__)) try: - with open(os.path.join(here, "README.md"), encoding="utf-8") as f: + with open(os.path.join(here, "../../README.md"), encoding="utf-8") as f: readme = f.read() - with open(os.path.join(here, "CHANGELOG.md"), encoding="utf-8") as f: + with open(os.path.join(here, "../../CHANGELOG.md"), encoding="utf-8") as f: changelog = f.read() long_description = f"{readme}\n\n{changelog}" except FileNotFoundError: @@ -14,7 +14,7 @@ setup( name="ArchLens", - version="0.4.0", + version="0.4.1", description="Designed for visualizing package dependencies and highlighting differences between" " branches in GitHub pull requests. It offers customization options to tailor package views.", author="The ArchLens Team", @@ -23,8 +23,10 @@ packages=find_packages(), long_description=long_description, long_description_content_type="text/markdown", - data_files=glob.glob("src/config.**.json"), include_package_data=True, + package_data={ + "src": ["config.schema.json", "config.template.json"], + }, install_requires=[ "plantuml", "typer", diff --git a/src/python/src/cli_interface.py b/src/python/src/cli_interface.py index cd68cb8e..901a332f 100644 --- a/src/python/src/cli_interface.py +++ b/src/python/src/cli_interface.py @@ -230,7 +230,7 @@ def read_config_file(config_path): config = json.load(f) config_schema = None - schema_path = os.path.join(os.path.dirname(__file__), "../config.schema.json") + schema_path = os.path.join(os.path.dirname(__file__), "config.schema.json") with open(schema_path) as fp: config_schema = json.load(fp) diff --git a/src/python/config.schema.json b/src/python/src/config.schema.json similarity index 100% rename from src/python/config.schema.json rename to src/python/src/config.schema.json diff --git a/src/python/config.template.json b/src/python/src/config.template.json similarity index 88% rename from src/python/config.template.json rename to src/python/src/config.template.json index 2d9adcfd..79fd0b4b 100644 --- a/src/python/config.template.json +++ b/src/python/src/config.template.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/archlens/ArchLens/master/src/python/config.schema.json", + "$schema": "https://raw.githubusercontent.com/archlens/ArchLens/master/src/python/src/config.schema.json", "name": "", "rootFolder": "", "github": {