Skip to content

Conversation

bjhargrave
Copy link
Contributor

@bjhargrave bjhargrave commented Apr 18, 2024

Changes

Which issue is resolved by this Pull Request:
Partial #760

Description of your changes:

This avoids the need to duplicate the schema files in this repository.

Also, since the taxonomy repo now uses submodules, we want to clone the
complete view of the repo.

@tiran
Copy link
Contributor

tiran commented Apr 19, 2024

Could you please mention submodules in the README? Contributors now have to clone the project with git clone --recurse-submodules or fetch the submodules afterwards. They have to pull and update the submodule every time it is moved to a new commit, e.g. git pull --recurse-submodules or git submodule update.

@github-actions github-actions bot added the documentation Improvements or additions to documentation label Apr 22, 2024
@nathan-weinberg
Copy link
Member

Looks like this needs rebase - is there anything else needed for this PR before merging?

@bjhargrave
Copy link
Contributor Author

Looks like this needs rebase

Done!

@bjhargrave
Copy link
Contributor Author

is there anything else needed for this PR before merging?

I don't think so. The taxonomy repo is now using submodule to incorporate the schema files.

@nathan-weinberg nathan-weinberg requested a review from a team April 25, 2024 14:41
bjhargrave added a commit to bjhargrave/instructlab_instructlab that referenced this pull request Apr 25, 2024
We introduce a relaxed schema as v1 which will accept all existing
taxonomy files in the main branch of the taxonomy repo. The current
v1 schema is renamed to v2 and will be used for future contributions
to the taxonomy repo.

Fixes instructlab#989

Depends on instructlab#913
and instructlab/schema#11

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
This avoids the need to duplicate the schema files in this repository.

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Since the taxonomy repo now uses submodules, we want to clone the
complete view of the repo. Docs are updated to mention submodule use
by the instructlab and taxonomy repositories.

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Copy link
Member

@hickeyma hickeyma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @bjhargrave

@hickeyma hickeyma merged commit e53bda4 into instructlab:main Apr 29, 2024
@bjhargrave bjhargrave deleted the schema-submodule branch April 29, 2024 15:25
bjhargrave added a commit to bjhargrave/instructlab_instructlab that referenced this pull request Apr 29, 2024
We introduce a relaxed schema as v1 which will accept all existing
taxonomy files in the main branch of the taxonomy repo. The current
v1 schema is renamed to v2 and will be used for future contributions
to the taxonomy repo.

Fixes instructlab#989

Depends on instructlab#913
and instructlab/schema#11

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
bjhargrave added a commit to bjhargrave/instructlab_instructlab that referenced this pull request Apr 29, 2024
We introduce a relaxed schema as v1 which will accept all existing
taxonomy files in the main branch of the taxonomy repo. The current
v1 schema is renamed to v2 and will be used for future contributions
to the taxonomy repo.

Fixes instructlab#989

Depends on instructlab#913
and instructlab/schema#11

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants