Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #275

Closed
wants to merge 241 commits into from
Closed

Develop #275

wants to merge 241 commits into from

Conversation

nh916
Copy link
Contributor

@nh916 nh916 commented Aug 17, 2023

Description

spelling fixes by @InnocentBug

Changes

Tests

Known Issues

Notes

Checklist

  • My name is on the list of contributors (CONTRIBUTORS.md) in the pull request source branch.
  • I have updated the documentation to reflect my changes.

* added CRIPT logo
* updated python badge to python 3.7 instead of python 3.9
* added a section that "we invite contribution"
ignoring common files and directories that are unneeded
added mypy cache to be ignored
brought it over from the old sdk docs
Create pull_request_template.md
moved pyproject.toml from src/ to the project root directory
* file.py
* group.py
* user.py
nh916 and others added 24 commits August 1, 2023 14:26
…cabCategories` (#243)

* added link for documentation for vocab categories

* refactored `ControlledVocabularyCategories` to `VocabCategories`

* changed documentation in controlled_vocabulary_categories.md
* changed example documentation
* changed how it is imported into __init__.py
* changed the test_api.py for it
* changed how it is used in api.py
* changed how it is used in material_deserialization.py

* formatter with trunk
* added vocab links

* testing CI

* last commit was for wrong branch

* fixed reading boolean from env var str

* added `CRIPT_TESTS` env var to test_coverage.yaml
…txt` (#245)

* updating requirements

and putting jupytext into requirements_docs.txt because it is only used within documentation

* updated and formatted test_examples.yml workflow CI
* updated documentation with our new code

* changed code examples
* changed code organization to work with the new SDK
* changed text hierarchy to all be h2
* added new headers to separate out the different parts of the tutorial

* changed text hierarchy

* updated env vars blog article links

* made it more consistent

* updated material property sub-object code

* py to python

* changed `CRIPT_TOKEN` to be more common sense

* test code error

* legacy fix

---------

Co-authored-by: Ludwig Schneider <ludwigschneider@uchicago.edu>
* changed conftest.py to get storage token from env variable

* updated CI to have `CRIPT_STORAGE_TOKEN`

* updated CI to have `CRIPT_STORAGE_TOKEN`
* wrote docs for `load_nodes_from_json`

* update docs for `load_nodes_from_json`

* added type hinting to `load_nodes_from_json`

* update `load_nodes_from_json` function to work correctly without errors

* updated docs fore `load_from_json` return type

* updated docs fore `load_from_json` return type

* optimized imports
* added documentation for `_NodeDecoderHook`

* fixed `_NodeDecoderHook` `def __init__()` notes

* fixed `_NodeDecoderHook` `def __call__()` returns documentation
* simplified tests and got rid of `deep_copy`

* optimized imports

* passed tests
adding `None` in header escapes the html and looks weird on the right side navigation
* updated tests for staging

* trunk spelling

---------

Co-authored-by: Ludwig Schneider <ludwigschneider@uchicago.edu>
* wrote documentation for `NodeEncoder`

* updated documentation for `NodeEncoder`

* updated documentation for `NodeEncoder`

* formatted with black

* added typing for mypy

* formatted with trunk

* ignoring mypy static type error

* updated documentation return type

* formatted with black

* adjust type description for condense_uuid

---------

Co-authored-by: Ludwig Schneider <ludwigschneider@uchicago.edu>
* add default args to JSON if not present

* fix collection integration, by surpressing the right default args in JSON

* trunk fixes

* found some more

* adjust tests

* missing test fix
* change the representation of UID

* fix the two tests that were missing

* this should work now

* missing test fix

* conftest get integration test var from env var with exception handling (#253)

* updated CI to have `CRIPT_STORAGE_TOKEN`

* if no env var then integration tests are true

* pass empty identifier list too

* uuidfy experiment/data

* thx mypy

---------

Co-authored-by: nh916 <navidhariri25@gmail.com>
@trunk-io
Copy link

trunk-io bot commented Aug 17, 2023

Merging to develop in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

@nh916 nh916 requested a review from InnocentBug August 17, 2023 18:15
@InnocentBug
Copy link
Collaborator

Wow. That seems like a big one.

is that the release commit?

@nh916
Copy link
Contributor Author

nh916 commented Aug 17, 2023

@InnocentBug it shouldn't be, its just a regular merge from develop to main

@nh916
Copy link
Contributor Author

nh916 commented Aug 17, 2023

let me close this and try it again and see if that makes a difference

@nh916 nh916 closed this Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants