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

Modified the way sed version is set #315

Merged
merged 11 commits into from
Mar 30, 2022

Conversation

krishnakumar27
Copy link
Contributor

#301

Updated the way sed is called depending on whether it was a MacOS version or BSD version of sed

@ckadner FYI

@ckadner ckadner removed the request for review from animeshsingh March 17, 2022 00:09
Copy link
Member

@ckadner ckadner left a comment

Choose a reason for hiding this comment

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

Thank you Krishna, did you test the two scripts?

  • for codegen.sh run it on the main repo clone and on the clone of your forks with the changes and use a file/directory comparison tool to make sure the outcome is the same before and after your changes. Running generate_code.sh (which is calling codegen.sh) should produce no changes (git status -> clean)
  • for add_license_header.sh, same thing, clone main repo and compare to your changed script. Here you would remove license header from a Python script, a JavaScript, a HTML, a YAML file and see it gets generated correctly

@ckadner
Copy link
Member

ckadner commented Mar 17, 2022

Oh, and you need to sign-off your commits to make the DCO checks pass :-)

@krishnakumar27
Copy link
Contributor Author

@ckadner I have tested both the scripts in both linux and mac. They seem to work as expected.

Copy link
Member

@ckadner ckadner left a comment

Choose a reason for hiding this comment

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

@mlx-bot
Copy link
Collaborator

mlx-bot commented Mar 30, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ckadner, krishnakumar27

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ckadner
Copy link
Member

ckadner commented Mar 30, 2022

Please fix the failing DCO check by (squashing and) signing your commits.

ckadner and others added 10 commits March 30, 2022 11:34
…xchange#302)

Pinning/downgrading the following dependencies:
* elyra-server<3.4.0            # elyra-server>=3.4.0 requires minio>7.0.0 which breaks mlx-api code
* python-lsp-server[all]<1.3.0  # from elyra-server, 1.3.0 requires autopep8>=1.6.0 but elyra-server==3.3.0 requires autopep8<1.5.6
* black==21.12b0                # from elyra-server, 22.1.0 requires click>=8.0.0 which breaks kfp 1.7.1 and Flask 1.1.4
* Flask>=1.1.4,<2.0.0           #  Flask>2.0.0 requires Werkzeug>=2.0, but connexion[swagger-ui]==2.9.0 requires werkzeug<2.0,>=1.0

Resolves machine-learning-exchange#299

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
* Added validate-id to __init__.py
* Added check to notebook_service_controller_impl.py
* Added validate-id check to dataset_service_controller_impl.py and
  model_service_controller_impl.py.
* Moved validate_id check to before id is generated and changed
  function call to check the id of the yaml file itself rather than generated id.

Resolves machine-learning-exchange#209

Signed-off-by: JAulet <51500017+JAulet@users.noreply.github.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…ge#306)

* Self-Referential Links Fix for Markdown View

Resolves machine-learning-exchange#261

Signed-off-by: RRM123 <rithikmamidi@gmail.com>

* Update package-lock.json

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

* Remove unused package "typescript-logging"

And its dependencies:
* "error-stack-parser"
* "stack-generator"
* "stackframe"
* "stacktrace-gps"
* "stacktrace-gps"
* "source-map"
* "stacktrace-js"

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

Co-authored-by: Christian Kadner <ckadner@us.ibm.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…g-exchange#307)

* Copy prereq from vanilla deployment

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Fix typo

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

Co-authored-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…ng-exchange#296)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.1...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
Resolves a task from machine-learning-exchange#304

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…ge#311)

Resolves a task from machine-learning-exchange#304

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…e#320)

Resolves machine-learning-exchange#319

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
…ge#314)

* Create readme for docs
* Add description table to readme
* Add links to table
* update relative links
* Change documentation to document

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
@krishnakumar27
Copy link
Contributor Author

@ckadner I just did the DCO signoff

@ckadner
Copy link
Member

ckadner commented Mar 30, 2022

Hi @krishnakumar27 -- I see a lot of unrelated commits in your PR since you used your forks main branch for your changes and then later merged the upstream main. I don't want to merge all of those other commits. Could you roll back your merge commits, i.e. git reset HEAD~10 (go 10 commits back), undo all of the other changes that aren't yours commit only your changes and then instead of doing merges, do a rebase the changes you made for this PR in your forks main? Though it looks like your actual code changes are in a commit somewhere in the middle of the 9 unrelated commits, so it might be easier to close this PR and create a new PR from a new feature branch (created after you update your forks main with the upstream main.

@ckadner ckadner merged commit 3671efa into machine-learning-exchange:main Mar 30, 2022
@ckadner
Copy link
Member

ckadner commented Mar 30, 2022

Hi @krishnakumar27 -- I resolved the merge conflict and did a dry-run to test squashing-merging your PR. Seems Github figured out that only 2 files were changed. So all is good. Please create a feature branch for your next contribution instead of committing directly to the main branch of your mlx fork :-)

@ckadner
Copy link
Member

ckadner commented Mar 30, 2022

/lgtm

@ckadner ckadner added the lgtm label Mar 30, 2022
@krishnakumar27
Copy link
Contributor Author

@ckadner Alright, yeah I was working with a feature branch in my fork, but I merged it to my main before creating a PR. I will create a PR directly from there the next time. Thank you

@ckadner ckadner added the Jump-Start Work items for Jump-Start participants label Jun 2, 2022
mlx-bot-app bot pushed a commit that referenced this pull request Oct 28, 2022
* Add dev doc links to CONTRIBUTING.md (#312)

Resolves a task from #304

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Fixes the references to latest kfctl release (#311)

Resolves a task from #304

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Do not verify links in project dependencies (#320)

Resolves #319

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

* Add navigation and description table of docs (#314)

* Create readme for docs
* Add description table to readme
* Add links to table
* update relative links
* Change documentation to document

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Add script to update the docs table  (#317)


Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Modified the way sed version is set (#315)

Instead of checking the operating system or shell emulator,
test which version of `sed` is actually installed in the local
environment.

Resolves #301

Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>

* Bump waitress from 2.0.0 to 2.1.1 in /api/server (#321)

Bumps [waitress](https://github.com/Pylons/waitress) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/Pylons/waitress/releases)
- [Changelog](https://github.com/Pylons/waitress/blob/master/CHANGES.txt)
- [Commits](Pylons/waitress@v2.0.0...v2.1.1)

---
updated-dependencies:
- dependency-name: waitress
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jupyter-server from 1.13.4 to 1.15.4 in /api/server (#324)

Bumps [jupyter-server](https://github.com/jupyter/jupyter_server) from 1.13.4 to 1.15.4.
- [Release notes](https://github.com/jupyter/jupyter_server/releases)
- [Changelog](https://github.com/jupyter-server/jupyter_server/blob/main/CHANGELOG.md)
- [Commits](jupyter-server/jupyter_server@v1.13.4...v1.15.4)

---
updated-dependencies:
- dependency-name: jupyter-server
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /dashboard/origin-mlx (#326)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump notebook from 6.4.8 to 6.4.10 in /api/server (#327)

Bumps [notebook](http://jupyter.org) from 6.4.8 to 6.4.10.

---
updated-dependencies:
- dependency-name: notebook
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update API developer docs (#325)

* Add codegen workflow diagram
* Describe codegen workflow
* Describe API server package modules

Closes #325

Signed-off-by: Pavan Pss <psspavan96@gmail.com>

Co-authored-by: Christian Kadner <ckadner@us.ibm.com>

* Update UI developer docs (#323)

Closes #323

Signed-off-by: RRM123 <rithikmamidi@gmail.com>

* Correct description for make update_doc_table (#329)

Signed-off-by: ezinneanne <onwukaezinneanne@gmail.com>

* Update Kubernetes high version in deployment docs (#318) (#332)

* Add Troubleshooting section
* Limit K8s version for KIND cluster using `--image` flag

Resolves #318

Signed-off-by: Kiran-Patel <kiran.patel@ibm.com>
Signed-off-by: Kiran Patel 104844270+kiranp2396@users.noreply.github.com
Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

Co-authored-by: Kiran-Patel <kiran.patel@ibm.com>
Co-authored-by: Christian Kadner <ckadner@us.ibm.com>

* fix errors in mlx-ui startup (#338)

* Run mlx-ui as non-root user (#339)

Closes #337

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

* Update MLX setup instructions for KF 1.5 (#346)

* Update MLX setup instructions for KF 1.5

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

* fix selected assets show up in different menus (#342)

Signed-off-by: Jiaxuan-Yang <jiaxuan.yang@ibm.com>

* Consolidate readme (#356)

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Co-authored-by: Rafael Vasquez <rafael.vasquez@ryerson.com>

* Document MLX Models Workshop (#352)

Signed-off-by: Christian Kadner <ckadner@us.ibm.com>

* Add GitHub action to verify doc links (#357)

Signed-off-by: Rafael Vasquez <raf.vasquez@ibm.com>

Signed-off-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Signed-off-by: Christian Kadner <ckadner@us.ibm.com>
Signed-off-by: Krishna Kumar <krishnakumar@ibm.com>
Signed-off-by: RRM123 <rithikmamidi@gmail.com>
Signed-off-by: ezinneanne <onwukaezinneanne@gmail.com>
Signed-off-by: Jiaxuan-Yang <jiaxuan.yang@ibm.com>
Signed-off-by: Rafael Vasquez <raf.vasquez@ibm.com>
Co-authored-by: Rafael Vasquez <rafael.vasquez@ryerson.ca>
Co-authored-by: Krishna Kumar Ramachandran <krishnakumar@gatech.edu>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavan Pss <psspavan96@gmail.com>
Co-authored-by: RRM123 <40575227+rrm123@users.noreply.github.com>
Co-authored-by: Ezinne Anne Emilia <onwukaezinneanne@gmail.com>
Co-authored-by: Kiran Patel <104844270+kiranp2396@users.noreply.github.com>
Co-authored-by: Kiran-Patel <kiran.patel@ibm.com>
Co-authored-by: jbusche <101845348+jbusche@users.noreply.github.com>
Co-authored-by: Joanna <Jiaxuan.Yang@ibm.com>
Co-authored-by: Rafael Vasquez <rafael.vasquez@ryerson.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Jump-Start Work items for Jump-Start participants lgtm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants