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

Apply lockfile before updating downstream requires #5771

Merged
merged 6 commits into from Sep 25, 2019

Conversation

@jgsogo
Copy link
Member

@jgsogo jgsogo commented Sep 19, 2019

Changelog: Fix: Apply lockfile to the node before updating with downstream requirements
Docs: omit

If we apply the graphlock to the requires declared in the recipe, they will be populated with some data (recipe revisions) and will match the requirements downstream that already contains graphlock information.

I'm using a version range harfbuzz/[>=1.0] in the requirement because it is resolved to a fixed version with the graphlock. With a regular requires harfbuzz/1.0 the behavior would be the same.

Fix #5754


Not fixed here:

  • ⚠️ If we require a specific revision, like harfbuzz/1.0#12345 then the diamond will be resolved and the requirement overridden with a misleading message:

    WARN: ffmpeg/1.0 requirement harfbuzz/1.0 overridden by meta/1.0 to harfbuzz/1.0 
    

    This happens with and without revisions enabled. It would be helpful to add the revisions to the output message (only if revisions are the difference between both references)

@jgsogo jgsogo force-pushed the issue/5754-lockfile-warnings branch 2 times, most recently from 22b9f1b to f367d6c Sep 19, 2019
@jgsogo jgsogo force-pushed the issue/5754-lockfile-warnings branch from f367d6c to 6ca0c1f Sep 19, 2019
@jgsogo jgsogo self-assigned this Sep 19, 2019
@lasote lasote added this to the 1.19 milestone Sep 23, 2019
@jgsogo jgsogo marked this pull request as ready for review Sep 25, 2019
Copy link
Member Author

@jgsogo jgsogo left a comment

I really Iike the changes 👍

@jgsogo jgsogo assigned lasote and unassigned jgsogo and memsharded Sep 25, 2019
@lasote lasote merged commit a845441 into conan-io:develop Sep 25, 2019
2 checks passed
@jgsogo jgsogo deleted the issue/5754-lockfile-warnings branch Sep 25, 2019
@lasote lasote removed their assignment Sep 26, 2019
czoido added a commit to czoido/conan that referenced this issue Sep 27, 2019
* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests
memsharded added a commit that referenced this issue Oct 1, 2019
* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* use pyreq short path if exists

* sync with develop

* revert change

* pass correct conanfile

* add test

* remove line

* clean test
memsharded added a commit to memsharded/conan that referenced this issue Oct 2, 2019
* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (conan-io#5808)

* app simplifying (conan-io#5806)

* Apply lockfile before updating downstream requires (conan-io#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (conan-io#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (conan-io#5815)

* no user/channel repr without _ (conan-io#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (conan-io#5820)

* fix upload package id (conan-io#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (conan-io#5823)

* Refresh token client support.  (conan-io#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* conan-io#5819 Show warning message for Python 3.4 (conan-io#5829)

* conan-io#5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (conan-io#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* use pyreq short path if exists

* sync with develop

* revert change

* pass correct conanfile

* add test

* remove line

* clean test
lasote added a commit that referenced this issue Oct 3, 2019
* refactor GraphBinariesAnalyzer

* 1.19.0 release

* 1.20.0-dev

* Issue/5814 fix python_requires with short_paths enabled (#5841)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* use pyreq short path if exists

* sync with develop

* revert change

* pass correct conanfile

* add test

* remove line

* clean test

* Feature/remote enable error handling (#5835)

* Add a test

* Raise an error if no remote found

* Check that we don't raise an error if the state is already in the required state

* Raise an error only if the remote name is not a wildcard

* Check that we don't raise an error with a wildcard if there are no remotes

* Removed go test files and references to golang from README (#5854)

* Removed go test files and references to golang from README

* Removed golang from README

* making GraphBinaryAnalyzer injectable
jgsogo added a commit that referenced this issue Oct 16, 2019
* remotes to metadata

* WIP

* layout of dev

* wip

* Removed versions

* working but not tested

* local

* Local, package failing because of none timestamp in PREV

* WIP

* search tests ok

* Fixing tests and small refactor

* renamed module

* review

* ISO in client, reviewed

* Fixing tests

* Fixing tests

* New tests about metadata being updated

* Review

* Time cleared on export/package

* Fix revisions list

* fixed test

* Unused import

* WIP

* Review

* Fixed test message assert

* Use env var instead of test client

* Cool testing framework and a lot of remove with revisions tests

* Remove tests revisions

* Drafting tests

* Test passing, a lot missing yet

* PENDING MANY TESTS

* some more tests

* Pending many tests

* Added more tests

* No revisions tests passing

* make BinariesAnalyzer the one responsible for the IDs

* remove build mode check

* Tests passing, only about 10 to complete

* changing how binary IDs are computed

* fixing tests

* refactoring tests

* binary ID belongs to graph Node

* working in graph

* Finished tests

* Upload package id not reference

* One more test

* SVN test

* IOError

* Fixing tests

* Fixing windows test with export package and package revisions

* Fixed test

* Pending migration

* Migration OK

* working...

* renaming conan->recipe

* Revisioning the revisions pull request

* CONAN_REVISIONS_ENABLED

* WIP

* Safer migration

* No revisions test

* V2 WIP

* WIP

* Review

* working except full_requires test broken

* WIP

* Rest routes

* working....

* working on it, very bad state

* Refactor routes

* Passing wihout revisions

* Removed time from metadata

* working but ConanInfo.full_requires test

* Passing tests

* Fixed more tests

* binary analyzer refactor

* Self review

* Imports

* small optimization of set_dirty(package_folder)

* Fixed rest api test

* Fixed slows

* Fixed py2 issue with exception translation with http codes

* rest api prepared revisions

* new graph builder

* working

* fixed test

* Dani and Diego review

* tests passing

* Fixing tests

* working

* Review

* Imports

* working...

* renamed bid->package_id

* import and comment

* renamed test

* tests passing

* changes

* removed prints

* moving tests

* improving tests

* new tests

* fixed py3

* working

* package-ID modes

* fixing tests

* fixing build_id test

* cleaning

* full test of package_id_mode

* package_id config modes

* fixing things

* working

* getting there...

* tests passing but RegistryTest and RemoteTest

* python requires updates

* fixed test with time.sleep()

* working

* adding definition of remotes too

* working in dumps, new remotes.txt file?

* tests passing missing file format

* fixing tests

* working

* remove simple paths

* remove simple paths

* renames

* removed print

* abs_path for CONAN_USER_HOME too

* fix storage_path

* working, not ready for review

* working...

* working..

* working...

* review and migrations for conan-config-install

* fix test

* fix error

* first draft ready

* added build-requires (forced for Unknown) capability

* refactor GraphBinariesAnalyzer

* fixing things

* allowing updating lock for PACKAGE_ID_UNKNOWN

* 1.19.0 release

* 1.20.0-dev

* Issue/5814 fix python_requires with short_paths enabled (#5841)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* use pyreq short path if exists

* sync with develop

* revert change

* pass correct conanfile

* add test

* remove line

* clean test

* Feature/remote enable error handling (#5835)

* Add a test

* Raise an error if no remote found

* Check that we don't raise an error if the state is already in the required state

* Raise an error only if the remote name is not a wildcard

* Check that we don't raise an error with a wildcard if there are no remotes

* Removed go test files and references to golang from README (#5854)

* Removed go test files and references to golang from README

* Removed golang from README

* making GraphBinaryAnalyzer injectable

* merged

* minor changes

* different approach to recompute ID

* unused import

* minor code structure changes

* fix test!

* message and reduced test

* tests with revisions
czoido added a commit that referenced this issue Oct 28, 2019
* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* store files checksum

* store downloaded recipes checksums

* store downloaded package checksum

* add checksums to metadata

* use checksums property

* refactor

* change function nae

* refactor

* minor changes

* change names

* minor changes

* minor changes

* fix comment

* minor changes

* minor changes

* test checksums in unit tests

* check checksums metatada

* return empty dict if not found

* move code

* check downloaded metadata

* change var name

* check real checksum
jgsogo added a commit that referenced this issue Oct 28, 2019
#5972)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* fix link

* remove https

* remove https

* fix links

* remove proxies message

* clarify missing section
lasote added a commit that referenced this issue Oct 30, 2019
* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* store files checksum

* store downloaded recipes checksums

* store downloaded package checksum

* add checksums to metadata

* use checksums property

* refactor

* change function nae

* refactor

* minor changes

* change names

* minor changes

* minor changes

* fix comment

* minor changes

* minor changes

* first args parse draft

* test checksums in unit tests

* check checksums metatada

* wip

* wip

* wip

* wip

* wip

* return empty dict if not found

* wip

* wip

* minor changes

* minor changes

* minor changes

* wip

* wip

* wip

* wip

* wip

* fix function args

* reorder

* minor changes

* build info merge

* wip

* sync changes

* fix args

* catch all exceptions

* fix call

* minor changes

* change output

* minor changes

* fix args

* wip

* minor changes

* wip

* wip

* wip

* minor changes

* wip

* wip

* use comprehension

* wip

* wip

* minor changes

* minor changes

* changes in help

* minor changes

* minor changes

* fix help

* minor changes

* minor changes

* minor changes

* fix test

* sync with checksum branch

* fix arguments

* wip

* simplify argument parsing

* minor changes

* minor changes

* add recommended use message

* change output

* fix tests

* add unit test

* minor changes

* wip

* better test example

* change name

* fix test

* fix test

* compare loop

* fix test

* fix for empty user/channel

* minor changes

* minor changes

* remove modules properties
czoido added a commit that referenced this issue Nov 26, 2019
* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* add progress bar for file list

* refactor compressing progress bars

* refactor upload progress bar

* name change

* move download code

* put IterableToFileAdapter back

* make file iterable

* file iterator

* fix iterable file

* change function place

* check output exists

* change ouput to tqdm

* minor changes

* wip

* minor changes

* wip

* add progress function

* change bar output

* wip

* convert list to string

* convert to string before output

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* refactor

* refactor download progress

* refactor bars

* check generator type

* minor changes

* put adapter

* change function name

* change upload to write

* fix names

* refactor written_chunks

* remove size query to progress bar

* fix download size return

* sync with develop

* add parallel argument

* fix add argument

* upload with threadpool

* manage bar positions

* fix output

* fix rewrite length

* output changes

* catch exceptions

* remove import

* print all errors

* change error message

* change default number of threads

* upload in parallel test

* minor changes

* adapt output on parallel upload scope

* fix format

* fix format

* fix test

* upload complete parallel

* minor changes

* minor changes

* add parallel upload

* merge changes

* fix test

* fix rest_client

* force non interactive mode with parallel uploads

* test behaviour

* fix test

* reorder

* add func

* minor changes

* minor changes

* add callback

* fix format

* add post_upload hook when no packages to upload

* prevent repeating headers

* minor fixes

* revert capabilities change

* output with tqdm

* remove output messages without revisions

* send messages to log

* add async comment

* number of threads in help

* change exception place

* move slots to progress bars

* remove attribute

* kill the thread when problems uploading recipe

* default_server_user

* remove check

* extra checks

* prevent upload packages if error

* fix test

* minor changes

* dont call hook

* change var name

* fix test

* remove debugging code

* simplify tests

* remove redundant code

* added mutex for hook lazy loading

* remove slots
lasote added a commit that referenced this issue Dec 2, 2019
…es (#6060)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* save conanworkspace.cmake relative to base folder

* add test

* siplify test

* add context manager to build folder

* change indent
memsharded added a commit to memsharded/conan that referenced this issue Dec 3, 2019
…es (conan-io#6060)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (conan-io#5808)

* app simplifying (conan-io#5806)

* Apply lockfile before updating downstream requires (conan-io#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (conan-io#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (conan-io#5815)

* no user/channel repr without _ (conan-io#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (conan-io#5820)

* fix upload package id (conan-io#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (conan-io#5823)

* Refresh token client support.  (conan-io#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* conan-io#5819 Show warning message for Python 3.4 (conan-io#5829)

* conan-io#5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (conan-io#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* save conanworkspace.cmake relative to base folder

* add test

* siplify test

* add context manager to build folder

* change indent
lasote added a commit that referenced this issue Dec 3, 2019
* removing pylint from conan codebase. TODO: Move to hooks

* add python_requires to 'conans'

* Fix SyntaxWarning in Python 3.8 (#6165)

* - generate ConfigVersion.cmake file (#6063)

Signed-off-by: SSE4 <tomskside@gmail.com>

* Fixes #5925 Make the first line from find program as the result (#6039)

* 3. extra separator in Windows

* Improve the error message when failed to connect to remote

* Improve the error message when failed to connect to remote

* Improve the error message when failed to connect to remote

* Revert unwanted changes

* Pick the first match which is the best match

* Pick the first match which is the best match

* make reversed explicit (better that [::-1])

* Fix output folder for conanworkspace.cmake when rebuilding dependencies (#6060)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* save conanworkspace.cmake relative to base folder

* add test

* siplify test

* add context manager to build folder

* change indent

* Publish 'artifacts.properties' using matrix params (#6014)

* draft to test

* add missing argument to functions

* rename 'put_headers' to 'artifact_properties'

* store matrix params as the preformatted string in the router

* fallback to empty string

* something going wrong: too many cchanges

* at least these are not needed

* typo

* it was only needed to remove the matrix_params for the bottle server

* soooo

* remove class name

* fix minor bug

* now with revisions too

* make docs with triple double quotes

* we need to modify the conan_server to accept matrix_params too

* fix tests

* add tests with artifacts.properties

* quote values of matrix params

* we can stack routes

* add tests with many different values

* remove changes not needed

* use server capability to choose the URL to build

* do not send headers if matrix_params capability

* do not add 'matrix_params' functionality to conan-server

* rename variable, 'file' is reserved

* remove change uneeded

* conan server does not support matrix params at all

* use the proper if/else

* Add res dir to the variables when using cmake_find_package. (issue 3722) (#6166)

* skip downloading call to to_file_bytes (#6142)

* warn if env-vars defined

* removed warning and env-vars

* remove another env-var
memsharded added a commit to memsharded/conan that referenced this issue Dec 3, 2019
…es (conan-io#6060)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (conan-io#5808)

* app simplifying (conan-io#5806)

* Apply lockfile before updating downstream requires (conan-io#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (conan-io#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (conan-io#5815)

* no user/channel repr without _ (conan-io#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (conan-io#5820)

* fix upload package id (conan-io#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (conan-io#5823)

* Refresh token client support.  (conan-io#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* conan-io#5819 Show warning message for Python 3.4 (conan-io#5829)

* conan-io#5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (conan-io#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* save conanworkspace.cmake relative to base folder

* add test

* siplify test

* add context manager to build folder

* change indent
lasote added a commit that referenced this issue Dec 3, 2019
* compatible_package build=missing

* move CONAN_EXPORTED and CONAN_IN_LOCAL_CACHE outside cmake_flags

* do not extract build_type and in_local_cache

* it is moved to the end of the command line

* Change help message for --build policy for create command (#6131)

* change build policy for create

* change to package name

* remove unused imports

* client.load() (#6140)

* Fixes #6044 Improve error with malformed settings yml (#6059)

* Fixes #6044 Improve error raised when 'settings.yml' cannot be parsed

* add tests for invalid settings YAML file

* Fix several issues with download command and revisions (#6138)

* fail if specifying rev with revs disabled

* fix reference with revisions

* add package revision to id

* add tests

* check revisions

* fix create without user channel

* add test without user channel

* minor changes

* skip depending on revisions

* add test with fake revision

* remove server from test

* test for older revision in server

* divide test

* Fix upload behaviour when using revisions for packages (#6143)

* wip

* fail if trying to upload different revision than in cache

* fail if rev specified without revs enabled

* add tests

* change line format

* fix python 27

* minor changes

* Fix SyntaxWarning in Python 3.8 (#6165)

* - generate ConfigVersion.cmake file (#6063)

Signed-off-by: SSE4 <tomskside@gmail.com>

* Fixes #5925 Make the first line from find program as the result (#6039)

* 3. extra separator in Windows

* Improve the error message when failed to connect to remote

* Improve the error message when failed to connect to remote

* Improve the error message when failed to connect to remote

* Revert unwanted changes

* Pick the first match which is the best match

* Pick the first match which is the best match

* make reversed explicit (better that [::-1])

* Fix output folder for conanworkspace.cmake when rebuilding dependencies (#6060)

* Added required = True to subparsers in order to print error message in Py2 and Py3.

* sync

* basic concurrent upload at reference level with futures

* revert changes

* add line

* Lock buggy urllib3 (#5808)

* app simplifying (#5806)

* Apply lockfile before updating downstream requires (#5771)

* apply graph_lock before looking for overrides

* first step: get rid of the warning

* cleaner if graph_lock is passed to the function

* only update requires upstream if no lockfile is applied

* fix tests

* Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756)

* if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them

* update tests accordingly

* test client load() file method (#5815)

* no user/channel repr without _ (#5817)

* no user/channel repr without _

* minor fixes

* fix tests

* Remove py34 (#5820)

* fix upload package id (#5824)

* - update macOS, watchOS, tvOS, iOS version numbers (#5823)

* Refresh token client support.  (#5662)

* Refresh token client support. Missing tests. Missing migration

* public method

* WIP

* Refresh almost there

* Removed prints

* Try migrate

* Migration

* Add comment

* Refresh token flow following RFC recommentations

* Refresh ok

* review

* Remove traces

* Refactor capabilities

* Removed tmp file

* Review

* #5819 Show warning message for Python 3.4 (#5829)

* #5819 Show warning message for Python 3.4

- Add new warning message for python 3.4 which is no longer supported
- Added funcional tests to validate both python 3.4 and 2.x

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* #5819 Fix broken tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Add cpp_info.name to cmake and pkg_config generators (#5598)

* Add cpp_info.name to cmake generators

* Fix unit tests to mimic real behavior

* cmake_paths test

* add test for cmake generator

* Add cmake_find_package test

* fix test in py3

* Applied cpp_info.name to pkg_config generator

* check different name in pkg_config

* sync with develop

* save conanworkspace.cmake relative to base folder

* add test

* siplify test

* add context manager to build folder

* change indent

* Publish 'artifacts.properties' using matrix params (#6014)

* draft to test

* add missing argument to functions

* rename 'put_headers' to 'artifact_properties'

* store matrix params as the preformatted string in the router

* fallback to empty string

* something going wrong: too many cchanges

* at least these are not needed

* typo

* it was only needed to remove the matrix_params for the bottle server

* soooo

* remove class name

* fix minor bug

* now with revisions too

* make docs with triple double quotes

* we need to modify the conan_server to accept matrix_params too

* fix tests

* add tests with artifacts.properties

* quote values of matrix params

* we can stack routes

* add tests with many different values

* remove changes not needed

* use server capability to choose the URL to build

* do not send headers if matrix_params capability

* do not add 'matrix_params' functionality to conan-server

* rename variable, 'file' is reserved

* remove change uneeded

* conan server does not support matrix params at all

* use the proper if/else

* Add res dir to the variables when using cmake_find_package. (issue 3722) (#6166)

* skip downloading call to to_file_bytes (#6142)

* remove syntax warning (#6174)

* fix cwd issues in set_version() evaluation (#6130)

* fix cwd issues in set_version() evaluation

* explicit self.recipe_folder
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants