Merge pull request #18 from Knowledge-Graph-Hub/rearrange-2

moved schema into proj_name folder

.github/workflows/doc_pages.yml

@@ -26,5 +26,5 @@ jobs:
     - name: Build documentation.
       run: |
         touch docs/.nojekyll
-        poetry run gen-doc -d docs src/schema/neat_ml_schema.yaml
+        poetry run gen-doc -d docs src/neat_ml_schema/schema/neat_ml_schema.yaml
         poetry run mkdocs gh-deploy

.github/workflows/qc.yml

@@ -28,9 +28,9 @@ jobs:
     #----------------------------------------------
     - name: Install Poetry
       uses: snok/install-poetry@v1.3
-      with:
-        virtualenvs-create: true
-        virtualenvs-in-project: true
+      # with:
+      #   virtualenvs-create: true
+      #   virtualenvs-in-project: true
 
     #----------------------------------------------
     #       load cached venv if cache exists      

Makefile

@@ -94,7 +94,7 @@ git-init-add: git-init git-add git-commit git-status
 git-init:
 	git init
 git-add:
-	git add .gitignore .github Makefile LICENSE *.md examples utils about.yaml mkdocs.yml poetry.lock project.Makefile pyproject.toml src/schema/*yaml src/*/datamodel/*py src/data
+	git add .gitignore .github Makefile LICENSE *.md examples utils about.yaml mkdocs.yml poetry.lock project.Makefile pyproject.toml src/neat_ml_schema/schema/*yaml src/*/datamodel/*py src/data
 	git add $(patsubst %, project/%, $(PROJECT_FOLDERS))
 git-commit:
 	git commit -m 'Initial commit' -a

README.md

@@ -1,5 +1,5 @@
 # Neat-ml schema
 
-Neat-ml schema defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat-ml-schema/blob/main/neat_ml_schema/src/schema/neat-ml-schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/neat-ml)). This project itself is generated using the command `linkml-ws new` derived from the [linkML](https://github.com/linkml/linkml) project.
+Neat-ml schema defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat-ml-schema/blob/main/neat_ml_schema/src/neat_ml_schema/schema/neat-ml-schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/neat-ml)). This project itself is generated using the command `linkml-ws new` derived from the [linkML](https://github.com/linkml/linkml) project.
 
 [Documentation](https://knowledge-graph-hub.github.io/neat-ml-schema/)

about.yaml

@@ -1,3 +1,3 @@
 name: neat_ml_schema
 description: Schema for driving NEAT
-source_schema_path: neat_ml_schema/src/schema/neat_ml_schema.yaml
+source_schema_path: neat_ml_schema/src/neat_ml_schema/schema/neat_ml_schema.yaml

docs/about.md

@@ -1,3 +1,3 @@
 # About NEAT schema
 
-This project defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat_ml_schema/blob/main/src/schema/neat_ml_schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/NEAT)). NEAT schema itself is generated from a [linkML](https://github.com/linkml/linkml) template.
+This project defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat_ml_schema/blob/main/src/neat_ml_schema/schema/neat_ml_schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/NEAT)). NEAT schema itself is generated from a [linkML](https://github.com/linkml/linkml) template.

src/docs/about.md

@@ -1,3 +1,3 @@
 # About NEAT schema
 
-This project defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat_ml_schema/blob/main/src/schema/neat_ml_schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/NEAT)). NEAT schema itself is generated from a [linkML](https://github.com/linkml/linkml) template.
+This project defines the schema in the form of a [YAML file](https://github.com/Knowledge-Graph-Hub/neat_ml_schema/blob/main/src/neat_ml_schema/schema/neat_ml_schema.yaml) for data going into graph ML pipelines (specifically [NEAT](https://github.com/Knowledge-Graph-Hub/NEAT)). NEAT schema itself is generated from a [linkML](https://github.com/linkml/linkml) template.

src/neat_ml_schema/__init__.py

@@ -0,0 +1 @@
+from .datamodel.neat_ml_schema import *

tests/test_neat_ml_schema.py

@@ -20,7 +20,9 @@ def setUpClass(cls) -> None:
     def setUp(self) -> None:
         """More setup."""
         cwd = os.path.dirname(__file__)
-        self.project_dir = os.path.join(os.getcwd(), "src/schema/")
+        self.project_dir = os.path.join(
+            os.getcwd(), "src/neat_ml_schema/schema/"
+        )
         self.resource_dir = os.path.join(cwd, "resources")
         self.GOOD_YAML_FILENAME = "test_good.yaml"
         self.BAD_YAML_FILENAME = "test_bad.yaml"