Skip to content

Commit ca4853f

Browse files
authored
Merge pull request #156 from NavAbility/23Q2/try/mvgqlcommon
fixing install of submodule tomls
2 parents 0999d9b + dfdd44f commit ca4853f

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "sdkCommonGQL"]
2-
path = sdkCommonGQL
2+
path = src/sdkCommonGQL
33
url = https://github.com/NavAbility/SDKCommonGQL.git

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include sdkCommonGQL/*.toml
1+
include src/sdkCommonGQL/*.toml

sdkCommonGQL

-1
This file was deleted.

setup.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ def run(self):
6464
sdist.run(self)
6565

6666

67+
# print("TO COPY", find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]))
68+
6769
setup(
6870
cmdclass={
6971
'develop': gitcmd_develop,
@@ -75,10 +77,11 @@ def run(self):
7577
license="Apache-2.0",
7678
author="NavAbility",
7779
author_email="[email protected]",
80+
packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
7881
package_dir={"": "src"},
79-
package_data={"navabilitysdk": ["sdkCommonGQL/*.toml",]},
82+
package_data={"sdkCommonGQL": ["*.toml",],},
83+
# data_files=[('sdkCommonGQL',['*.toml',]),],
8084
include_package_data=True,
81-
packages=find_packages("src", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
8285
# entry_points={"console_scripts": ["navability = navability.main:cli"]},
8386
python_requires=">=3.8",
8487
download_url=f"https://github.com/NavAbility/NavAbilitySDK.py/archive/refs/tags/v{_version}.tar.gz", # noqa: E501, B950

src/navability/services/loader.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,5 @@ def detect_cycle(
161161

162162

163163
# Load all GraphQL operations from the "sdkCommonGQL" folder and export them
164-
GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent.parent,"sdkCommonGQL"))
164+
GQL_FRAGMENTS, GQL_OPERATIONS = get_operations(os.path.join(pathlib.Path(__file__).parent.parent.parent,"sdkCommonGQL"))
165165
# (os.path.join(".", "sdkCommonGQL"))

src/sdkCommonGQL

Submodule sdkCommonGQL added at 170610c

0 commit comments

Comments
 (0)