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

allow to copy & paste from compact format into conan-lock-add #15262

Merged

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Dec 13, 2023

Changelog: Feature: Allow copy&paste of recipe revisions with timestamps from --format=compact into conan lock add.
Docs: conan-io/docs#3533

@memsharded memsharded marked this pull request as draft December 13, 2023 09:02
@memsharded memsharded added this to the 2.1 milestone Dec 18, 2023
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

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

After speaking with the team, let's try to have both the %float formatter and the human readable timestamp in the output, see how that looks

@AbrilRBS
Copy link
Member

AbrilRBS commented Jan 4, 2024

This now looks something like this:
image

I've also added it to the normal --format=text output, I think this is ok

@AbrilRBS AbrilRBS marked this pull request as ready for review January 4, 2024 07:48
@memsharded
Copy link
Member Author

Looks good, I think we can move this forward with this (tests broken). How does the normal --format=text looks like on screen?

@AbrilRBS
Copy link
Member

AbrilRBS commented Jan 4, 2024

Captura de pantalla 2024-01-04 a las 12 24 55

@memsharded memsharded merged commit 0ae23f2 into conan-io:release/2.0 Jan 4, 2024
2 checks passed
@memsharded memsharded deleted the feature/lock_add_human_timestamps branch January 4, 2024 22:15
memsharded added a commit to memsharded/conan that referenced this pull request Jan 8, 2024
…io#15262)

* allow to copy & paste from compact format into conan-lock-add

* Revert, and just print the %timestamp too

* Remove float timestamp from conan list --format=text

* Fix test

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
czoido added a commit that referenced this pull request Jan 24, 2024
* Git.to_conandata and from_conandata

* Raise error if `check_type=int` and conf value is set to `bool` (#15378)

raise if bool on int check

* auto -FS in AutotoolsToolchain (#15375)

* auto -FS in AutotoolsToolchain

* moved test

* fix winsdk_version bug (#15373)

* allow to copy & paste from compact format into conan-lock-add (#15262)

* allow to copy & paste from compact format into conan-lock-add

* Revert, and just print the %timestamp too

* Remove float timestamp from conan list --format=text

* Fix test

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* wip

---------

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
czoido added a commit that referenced this pull request Nov 22, 2024
* refactor: move editables to local api

* workspaces back

* wip

* Git.to_conandata and from_conandata

* Raise error if `check_type=int` and conf value is set to `bool` (#15378)

raise if bool on int check

* auto -FS in AutotoolsToolchain (#15375)

* auto -FS in AutotoolsToolchain

* moved test

* fix winsdk_version bug (#15373)

* allow to copy & paste from compact format into conan-lock-add (#15262)

* allow to copy & paste from compact format into conan-lock-add

* Revert, and just print the %timestamp too

* Remove float timestamp from conan list --format=text

* Fix test

---------

Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>

* wip

* wip

* open + add + remove proposal

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* initial minimal workspace

* wip

* new test

* minor change to make test fail

* making workspace decoupled from editables

* fix docstring

* new test for dynamic workspace

* UserWorkpaceAPI

* fix test

* review

---------

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Rubén Rincón Blanco <git@rinconblanco.es>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants