Skip to content

Commit

Permalink
Merge pull request #157 from NavAbility/main
Browse files Browse the repository at this point in the history
v0.6.0-1
  • Loading branch information
dehann authored May 16, 2023
2 parents b0f9784 + ca4853f commit efe0491
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "sdkCommonGQL"]
path = sdkCommonGQL
path = src/sdkCommonGQL
url = https://github.com/NavAbility/SDKCommonGQL.git
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include sdkCommonGQL/*.toml
include src/sdkCommonGQL/*.toml
1 change: 0 additions & 1 deletion sdkCommonGQL
Submodule sdkCommonGQL deleted from ca17c9
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ def run(self):
sdist.run(self)


# print("TO COPY", find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]))

setup(
cmdclass={
'develop': gitcmd_develop,
Expand All @@ -75,10 +77,11 @@ def run(self):
license="Apache-2.0",
author="NavAbility",
author_email="[email protected]",
packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
package_dir={"": "src"},
package_data={"navabilitysdk": ["sdkCommonGQL/*.toml",]},
package_data={"sdkCommonGQL": ["*.toml",],},
# data_files=[('sdkCommonGQL',['*.toml',]),],
include_package_data=True,
packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
# entry_points={"console_scripts": ["navability = navability.main:cli"]},
python_requires=">=3.8",
download_url=f"https://github.com/NavAbility/NavAbilitySDK.py/archive/refs/tags/v{_version}.tar.gz", # noqa: E501, B950
Expand Down
2 changes: 1 addition & 1 deletion src/navability/services/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,5 +161,5 @@ def detect_cycle(


# Load all GraphQL operations from the "sdkCommonGQL" folder and export them
GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent.parent,"sdkCommonGQL"))
GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent,"sdkCommonGQL"))
# (os.path.join(".", "sdkCommonGQL"))
1 change: 1 addition & 0 deletions src/sdkCommonGQL
Submodule sdkCommonGQL added at 170610

0 comments on commit efe0491

Please sign in to comment.