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.

Sign up for GitHub

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

Jump to bottom

Merge commit from conan-io. #3

Merged
merged 34 commits into from
Nov 7, 2019
Merged

Merge commit from conan-io. #3

merged 34 commits into from
Nov 7, 2019

Conversation

nicememory
Copy link
Owner

Changelog: (Feature | Fix | Bugfix): Describe here your pull request
Docs: https://github.com/conan-io/docs/pull/XXXX

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

danimtb and others added 30 commits October 25, 2019 12:40
@danimtb
1.19.3 version
f31eaa2
@memsharded @lasote
Hotfix/complex search client (#5970)
86ad4c6 
* force complex_search always in client

* force query=None
@memsharded @lasote
do not use overrides in public_deps in cmake (#5971)
e58ec51
@danimtb @lasote
Fix cpp_info.name not used in cmake find generators for dependencies (#…
72f6f93 
…5973)

* Fix cpp_info.name not used in cmake find generators for dependencies

* fix test py3

* fix tests
@lasote
Fix/astroid less 2 (#5987)
3c602df 
* Astroid limited to 1.X. 2.X is py3 only

* pylint limited too

* pyling <2
@danimtb @lasote
Use cpp_info.name lower case in pkg-config generator when defined (#5988
56b46c8 
)
@lasote
Fixed pylint requirements, py37 (#5994)
ca9fe2b 
* Fixed requirements

* lower astroid for py3

* lower astroid for py3
@memsharded @lasote
Feature/compatible ids (#5837)
5d10715 
* working

* refactor GraphBinariesAnalyzer

* working...

* working

* improved compatible IDs

* embedded append

* fixing export conflict when no user channel

* new test without user/channel

* replaced error msg => info

* explicit append syntax

* using settings and options of the compatible_package in package_id()

* fix tests
@lasote
Merge branch 'release/1.19.3'
4eb1dfc
@lasote
Merged 1.19.3
ae496cc
@danimtb @lasote
Model system_libs in cpp_info/deps_cpp_info and generators (#5582)
9b6028e 
* Add unit test

* add package_info system_deps test

* system_deps attribute for cpp_info and deps_cpp_info

* Add system_deps to cmake generator

* fix import

* import load

* Add target check for CMake test

* Add CMake find_package tests

* Add support for visual studio

* Adds json generator

* fix visual support

* Support text generator

* support pkg-config

* Add xcode and fix visual studio

* Add compiler_args generator

* Add make generator

* Add system deps variable to cmake find package

* check system deps for find package multi

* fix visual test

* cmake targets

* some asserts for system deps in cmake

* use CONAN_SYSTEM_DEPS in targets

* update cmake tests

* fix test

* fix using libs_system_frameworks

* bring deps.libs back

* Modify frameworks test

* fix name of linux fake libs

* Rename system_deps to system_libs

* fix visual generator and test

* Review: change to client.load()

* Review: Fix cmake_find_package_multi

* remove with_exports_sources()

* fix system libs link in cmake_find_package

* review

* Fix cmake multi and test

* Add CONAN_PKG_LIBS_<PKG-NAME>

* revert changes in frameworks test

* Use CONAN_PKG_LIBS when generating targets

* remove repeated lines
@danimtb @lasote
Add build_modules to cpp_info and manage CMake modules (#5940)
7482b02 
* Add build_modules to cpp_info and manage CMake modules

* Add CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH

* cleaned code, moved and completed test

* test for find package generator

* add includes to cmake generator and more tests

* support multi generators

* Support cmake_find_package_multi and improve cmake_find_package

* fix test

* set CONAN_BUILD_MODULES_PATHS

* cmake macro

* store paths in cmake variables

* fix extend and add mock for filter_empty

* fix test

* remove not used function

* Filter not cmake modules

* _filter_file_paths

* fix cmake_find_package_multi

* remove message

* remove append and join

* fixes

* do not filter build modules
@czoido @lasote
Improve conan_build_info command (#5950)
f67bf29 
* 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
@memsharded
fixing download without user channel
db897f4
@memsharded
Merge pull request #6010 from memsharded/feature/fix_download_no_user…
aedb6fc 
…_channel

fixing download without user channel
@ilyashamd
Fix typos, grammar and spelling in README.rst
ab66ca5
@memsharded
Merge pull request #6015 from ilyashamd/develop
c8cc271 
Fix typos, grammar and spelling in README.rst
@lasote
Fix tests
127e995
@danimtb @lasote
Fix apple frameworks in CMake generators (#6003)
c69c5bf 
* Fix apple frameworks in cmake generators

* move macro and fixed tests

* revert new line

* fix tests

* fix more tests

* fix

* more fixes

* fix assert

* sorted

* fix frameworks test

* fix assert

* cast to str

* Added not found error message

* work around a failing test

* remove print function

* Use CONAN_PKG_LIBS

* fix conan_package_library_targets() and tests

* Update conans/test/functional/generators/cmake_find_package_test.py

* changed message and vars

* fix brackets

* remove global CONAN_LIBS_FRAMEWORKS

* Update conans/test/functional/generators/cmake_find_package_test.py

* Use parameters in conan_find_apple_frameworks()

* fix tests

* try to fix macro

* fix macro
@lasote
Open release 1.20.0 branch
043a651
@lasote
Merge branch 'release/1.20.0'
67c8943
@lasote
Merge tag '1.20.0' into develop
011970e 
1.20.0
@lasote
1.21.0-dev
3bb6069
@lasote
Open 1.20.1
d67c1a3
@lasote
Fix auth error during capabilities fetch (#6022)
0406470 
* Fix auth error during capabilities fetch

* Added test
@lasote
Merge branch 'release/1.20.1'
e55717d
@lasote
Merged 1.20.1
5a199cb
@jgsogo @lasote
[refact] Rename 'put_headers' to 'artifacts_properties' (#6013)
4d7ef57 
* rename 'put_headers' to 'artifact_properties'

* typo
@akemimadoka @lasote
use win_bash in configure --help (#6026)
a227322
@memsharded
bumped 1.20.2
28a49bb
@nicememory nicememory merged commit ef8badd into nicememory:develop Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@nicememory @danimtb @memsharded @lasote @czoido @ilyashamd @jgsogo @akemimadoka @uilianries