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

docs: rename dvc lock -> dvc freeze #1380

Merged
merged 5 commits into from
Jun 3, 2020
Merged

docs: rename dvc lock -> dvc freeze #1380

merged 5 commits into from
Jun 3, 2020

Conversation

efiop
Copy link
Contributor

@efiop efiop commented May 30, 2020

Per iterative/dvc#3915

You may disregard these recommendations if you used the Edit on GitHub button from dvc.org to improve a doc in place.

❗ Please read the guidelines in the Contributing to the Documentation list if you make any substantial changes to the documentation or JS engine.

🐛 Please make sure to mention Fix #issue (if applicable) in the description of the PR. This causes GitHub to close it automatically when the PR is merged.

Please choose to allow us to edit your branch when creating the PR.

Thank you for the contribution - we'll try to review it as soon as possible. 🙏

@shcheklein shcheklein temporarily deployed to dvc-landing-lock-freeze-oqxwbk May 30, 2020 22:53 Inactive
@calibre-analytics
Copy link

You are out of tests

Choose a plan to resume monitoring your Sites and Pull Requests. If you need help, check the Manage Your Plan and Test Usage guide.

@shcheklein
Copy link
Member

shcheklein commented May 31, 2020

things to take care of:

  • add redirects lock -> freeze (redirects.json)
  • rename in the prism dvc-commands.js
  • fix completion scripts
  • grep dvc lock - to make sure that we renamed it everywhere

@shcheklein shcheklein temporarily deployed to dvc-landing-lock-freeze-oqxwbk May 31, 2020 00:15 Inactive
@shcheklein shcheklein temporarily deployed to dvc-landing-lock-freeze-oqxwbk May 31, 2020 00:18 Inactive
@efiop
Copy link
Contributor Author

efiop commented May 31, 2020

@shcheklein Done.

@efiop
Copy link
Contributor Author

efiop commented May 31, 2020

Tests fail because they try to check links that are not yet deployed.

@shcheklein
Copy link
Member

@efiop yep, it's a well know and unfortunate limitation, gonna fix this in #1000 /cc @casperdcl

Copy link
Contributor

@jorgeorpinel jorgeorpinel left a comment

Choose a reason for hiding this comment

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

Couple minor issues. Is this released though? Otherwise no rush no merge this, right? Thanks

@shcheklein shcheklein temporarily deployed to dvc-landing-lock-freeze-oqxwbk June 3, 2020 01:18 Inactive
@shcheklein shcheklein temporarily deployed to dvc-landing-lock-freeze-oqxwbk June 3, 2020 01:21 Inactive
@efiop
Copy link
Contributor Author

efiop commented Jun 3, 2020

Couple minor issues. Is this released though? Otherwise no rush no merge this, right? Thanks

@jorgeorpinel It is merged. I think current approach is to just merge 1.0 changes into master, no?

@jorgeorpinel
Copy link
Contributor

current approach is to just merge 1.0 changes into master, no?

I'm not sure. I thought we were timing all of these meaning just letting them be approved to merge them all at once when 1.0 is released.

Restyle docs: rename `dvc lock` -> `dvc freeze`
@jorgeorpinel jorgeorpinel temporarily deployed to dvc-landing-lock-freeze-oqxwbk June 3, 2020 15:10 Inactive
@efiop
Copy link
Contributor Author

efiop commented Jun 3, 2020

@jorgeorpinel We have a mix of all of them right now. E.g. plots are from 1.0. It makes sense to continue merging.

@shcheklein shcheklein merged commit c8b720a into master Jun 3, 2020
@efiop efiop deleted the lock_freeze branch June 3, 2020 21:27
@jorgeorpinel
Copy link
Contributor

Post moretm review/ questions @efiop:

  • What about phrase "always locked" used in the import(_url) cmd refs?
  • What about locked field in YAML files? Did it change to frozen? (Should it?) — mentioned in examples and DVC files & dirs guide
  • .dvc/lock, .dvc/tmp/lock, and .dvc/tmp/rwlock stay the same?
  • dvc show --locked ?

Thanks

@efiop
Copy link
Contributor Author

efiop commented Jun 8, 2020

@jorgeorpinel

What about phrase "always locked" used in the import(_url) cmd refs?

Oops, missed that one. #1404 Thank you! 🙏

What about locked field in YAML files? Did it change to frozen? (Should it?) — mentioned in examples and DVC files & dirs guide

I didn't touch that one because it will need to be removed/reworked for 1.0. I'll leave a comment in https://github.com/iterative/dvc.org/pull/1370/files , since it is already there.

.dvc/lock, .dvc/tmp/lock, and .dvc/tmp/rwlock stay the same?

Correct.

dvc show --locked ?

no such command in 1.0, dvc dag replaced it and didn't implement locked yet

@jorgeorpinel
Copy link
Contributor

Awesome.

@efiop
Copy link
Contributor Author

efiop commented Jun 9, 2020

.dvc/lock, .dvc/tmp/lock, and .dvc/tmp/rwlock stay the same?

@jorgeorpinel Just to clarify: .dvc/lock is no more, it has been moved to .dvc/tmp/lock. https://dvc.org/doc/user-guide/dvc-files-and-directories already reflects that.

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