Skip to content
This repository has been archived by the owner on Jun 15, 2024. It is now read-only.

Release v2.0.0 #77

Draft
wants to merge 49 commits into
base: master
Choose a base branch
from
Draft

Release v2.0.0 #77

wants to merge 49 commits into from

Commits on Sep 23, 2022

  1. Functional improvements

    @CVilla17
    CVilla17 committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    326980a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. removing public option

    @CVilla17
    CVilla17 committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    f75d461 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Upgrade cript version to 0.5.0

    @rjmello
    rjmello committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    1a6c6c5 View commit details
    Browse the repository at this point in the history

  2. Modify how File and Data objects are associated

    @rjmello
    rjmello committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    fb88a50 View commit details
    Browse the repository at this point in the history

  3. Upload File objects first

    @rjmello
    rjmello committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    5b09a65 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #34 from C-Accel-CRIPT/sdk-update 

    Sync with SDK v0.5.0
    @nh916
    nh916 authored Sep 29, 2022
    Configuration menu
    Copy the full SHA
    c79356a View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Attempting to solve merge conflicts

    @CVilla17
    CVilla17 committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    3151614 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Merge pull request #33 from C-Accel-CRIPT/Carlos-dev 

    Removing public option
    @rjmello
    rjmello authored Oct 7, 2022
    Configuration menu
    Copy the full SHA
    4d53301 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Merge branch 'master' into fix_develop_branch_and_master 

    # Conflicts:
#	main.py
#	requirements.txt
    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    7dec68b View commit details
    Browse the repository at this point in the history

  2. bumping version to 0.6.3

    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    8c569f8 View commit details
    Browse the repository at this point in the history

  3. removed requirements_dev.txt 

    removed requirements_dev.txt because it is no longer needed and just adds extra file
    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    8e252aa View commit details
    Browse the repository at this point in the history

  4. updated packages on requirements.txt 

    updated third party packages and tested the Excel uploader and created and executable and tested it again and it worked fine
    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    748f4cd View commit details
    Browse the repository at this point in the history

  5. removing docs from master, so docs can only live in the docs branch 

    removing docs CI/CD GitHub action, docs folder, mkdocs.yml file
    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    0714e0c View commit details
    Browse the repository at this point in the history

  6. removed requirements_docs.txt from master branch because everything f… 

    …or docs is in the docs branch
    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    82dc9ff View commit details
    Browse the repository at this point in the history

  7. added pandas to dependencies and showing that we are using python 3.9+

    @nh916
    nh916 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    469e543 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Merge pull request #45 from C-Accel-CRIPT/fix_develop_branch_and_master 

    PR to match develop to master
    @brili
    brili authored Nov 16, 2022
    Configuration menu
    Copy the full SHA
    cd08e2c View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2022

  1. Merge pull request #49 from C-Accel-CRIPT/readme_badges 

    * added pandas to dependencies and showing that we are using python 3.9+
    @nh916
    nh916 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    fa3b1a2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48 from C-Accel-CRIPT/bump_version 

    Bump version
    @nh916
    nh916 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    be77009 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #47 from C-Accel-CRIPT/update_requirements 

    * update requirements.txt 
* put requirements_dev.txt into requirements.txt
* removed requirements_dev.txt
    @nh916
    nh916 authored Dec 1, 2022
    Configuration menu
    Copy the full SHA
    e4f797c View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. Fix mac issues

    Bora Dauti authored and Bora Dauti committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    7fb5e73 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Merge pull request #53 from DBoraD/fix-mac_build 

    Fix mac issues
    @brili
    brili authored Dec 19, 2022
    Configuration menu
    Copy the full SHA
    1a7a68b View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. updated workflow (#54) 

    updated workflow to use requirements.txt instead of requirements_dev.txt
    @nh916
    nh916 authored Dec 23, 2022
    Configuration menu
    Copy the full SHA
    3a084f9 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. updated importing tkinter (#55)

    @nh916
    nh916 authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    6991cfe View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Feature property method (#57) 

    * adding property:method
    @CVilla17
    CVilla17 authored Jan 3, 2023
    Configuration menu
    Copy the full SHA
    c939411 View commit details
    Browse the repository at this point in the history

  2. Add material characteristics (#52) 

    * Add characterization for exisitng materials functionality

* Tested add_material_characteristics and made fixes

* changed truth check

* Tested synthesis, works. Also, changed truth checking back

* made boolean assignment a function

* Variable for row input start
    @CVilla17
    CVilla17 authored Jan 3, 2023
    Configuration menu
    Copy the full SHA
    15c43f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Version bump 1.0.0 (#59) 

    * version bump to 0.6.4

* version bump to 1.0.0
    @nh916
    nh916 authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    4a41348 View commit details
    Browse the repository at this point in the history

  2. fixed artifact name (#61) 

    to be "CRIPT_Excel_Uploader_Mac_Zip" instead of before when it would come out to "CRIPT.Excel.Uploader.Mac.Zip"
    @nh916
    nh916 authored Jan 4, 2023
    Configuration menu
    Copy the full SHA
    84bc585 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. update requirements.txt and bump Excel Uploader version (#67) 

    updated requirements.txt to use CRIPT 0.6.1 instead of 0.6.0
updated Excel Uploader version to say 1.0.1 to reflect the patch
    @nh916
    nh916 authored Jan 17, 2023
    Configuration menu
    Copy the full SHA
    96c6d30 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Resolve merge conflict between master and develop branch (#69) 

    * Update issue templates

I think having good issue templates where users can report their issue with the needed information can benefit this repository and help our users

* Update README.md

* New Release (#60)

* bumping version to 0.6.3

* removed requirements_dev.txt

* updated packages on requirements.txt

* removing docs from master, so docs can only live in the docs branch

* Fix mac issues

* updated workflow (#54)

updated workflow to use requirements.txt instead of requirements_dev.txt

* updated importing tkinter (#55)

* Feature property method (#57)

* adding property:method

* Add material characteristics (#52)

* Add characterization for exisitng materials functionality

* Tested add_material_characteristics and made fixes

* changed truth check

* Tested synthesis, works. Also, changed truth checking back

* made boolean assignment a function

* Variable for row input start

* Version bump 1.0.0 (#59)

* version bump to 0.6.4

* version bump to 1.0.0

Co-authored-by: CVilla17 <[email protected]>
Co-authored-by: Brilant Kasami <[email protected]>
Co-authored-by: Bora Dauti <[email protected]>
Co-authored-by: CVilla17 <[email protected]>

Co-authored-by: Ardi <[email protected]>
Co-authored-by: Brilant Kasami <[email protected]>
Co-authored-by: CVilla17 <[email protected]>
Co-authored-by: Bora Dauti <[email protected]>
Co-authored-by: CVilla17 <[email protected]>
    @nh916 @Ardi028
    @brili @CVilla17
    6 people authored Jan 18, 2023
    Configuration menu
    Copy the full SHA
    5922cc0 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. Changes to allow for smooth file uploads (#75)

    @CVilla17
    CVilla17 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    8d6a74c View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. version bump (#76)

    @nh916
    nh916 authored Feb 6, 2023
    Configuration menu
    Copy the full SHA
    5df4c49 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Fix merge conflict (#78) 

    * fixing merge conflict for release
    @nh916
    nh916 authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    b05bc7d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:C-Accel-CRIPT/cript-excel-upload… 

    …er into fix_cell_key_bug
    @CVilla17
    CVilla17 committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    e77b5f7 View commit details
    Browse the repository at this point in the history

  3. Changed values in parse.py to use correct cell key

    @CVilla17
    CVilla17 committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d42cee5 View commit details
    Browse the repository at this point in the history

  4. Fix cell key bug (#79) 

    * Changed values in parse.py to use correct cell key
    @CVilla17
    CVilla17 authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    1dbb6fc View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. Fixing merge conflict (#80) 

    * fixing merge conflict
    @nh916
    nh916 authored Feb 16, 2023
    Configuration menu
    Copy the full SHA
    2dcca1e View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge branch 'develop' of github.com:C-Accel-CRIPT/cript-excel-upload… 

    …er into newFunctionality
    @CVilla17
    CVilla17 committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    20bfb9e View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Can add existing material nodes from other projects

    @CVilla17
    CVilla17 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    12c855b View commit details
    Browse the repository at this point in the history

  2. got rid of a print statement

    @CVilla17
    CVilla17 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    0231334 View commit details
    Browse the repository at this point in the history

  3. Experiment and inventory update

    @CVilla17
    CVilla17 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3534d39 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Merge pull request #82 from C-Accel-CRIPT/experiment_and_inventory 

    Experiment and inventory
    @brili
    brili authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    9e92c51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #81 from C-Accel-CRIPT/use_existing_mat_nodes 

    Use existing mat nodes
    @brili
    brili authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    4ad2670 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Made changes to updates in response to code review comments

    @CVilla17
    CVilla17 committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    0595728 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Made changes to updates in response to code review comments (#85)

    @CVilla17
    CVilla17 authored Mar 29, 2023
    Configuration menu
    Copy the full SHA
    ac1589a View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. Changed sheet parameters to include new sheets, and partially impleme… 

    …nted computational forcefield
    @CVilla17
    CVilla17 committed May 6, 2023
    Configuration menu
    Copy the full SHA
    2ba972c View commit details
    Browse the repository at this point in the history

  2. Rough specs for new functions

    @CVilla17
    CVilla17 committed May 6, 2023
    Configuration menu
    Copy the full SHA
    1475dcc View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. expanding data model for computat

    @CVilla17
    CVilla17 committed May 14, 2023
    Configuration menu
    Copy the full SHA
    1cc443f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature_clean_updates

    @CVilla17
    CVilla17 authored May 14, 2023
    Configuration menu
    Copy the full SHA
    b6a6fac View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge pull request #86 from C-Accel-CRIPT/feature_clean_updates 

    Expansion of data model
    @CVilla17
    CVilla17 authored May 25, 2023
    Configuration menu
    Copy the full SHA
    ae4bddc View commit details
    Browse the repository at this point in the history