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

add new variable CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE #354

Closed
SSE4 opened this issue Mar 19, 2019 · 2 comments · Fixed by #357
Closed

add new variable CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE #354

SSE4 opened this issue Mar 19, 2019 · 2 comments · Fixed by #357
Assignees
@uilianries
Labels
complex: low component: build Build helpers, build systems... priority: medium stage: review type: feature
Milestone
0.25.0

Comments

@SSE4
Copy link

SSE4 commented Mar 19, 2019 •
edited
Loading

currently, CPT always uses conanfile.py as name of conan file containing ConanFile class.
this works flawlessly for the most of use cases, however for the use case installer + library in the same repo (e.g. bison, flex, vulkan, ICU, etc) it's not enough, obviously.
I propose to add new variable named CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE to override default.
related code is around here:

conan-package-tools/cpt/runner.py

Line 89 in 14c8688

r = self._conan_api.create(".", name=name, version=version,

as you can see, it just always invokes conan create . via conan API, and there is no way to use different file name.
in general, I prefer to leave my build scripts untouched (so they match templates), and just specify variable name in travis matrix, like:

CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE=bison.py
CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE=bison_installer.py

/cc @uilianries

Description of Problem, Request, or Question

Environment Details

  • Conan Package Tools Version: 0.23.0
  • Operating System: Linux
  • Operation System Version: Ubuntu 16.04
  • Compiler+version: gcc-5.4
  • Docker image: conanio/gcc7
  • Conan version: conan 1.2.0
  • Python version: python 3.7.0

Steps to reproduce (Include if Applicable)

Build logs (Include if Available)
@uilianries
Copy link
Member

I agree, but could we use CONAN_CONANFILE instead of CONAN_CUSTOM_CONANFILE_NAME_OVERRIDE ?

@uilianries uilianries self-assigned this Mar 19, 2019
@SSE4
Copy link
Author

SSE4 commented Mar 19, 2019

ok

@uilianries uilianries added this to the 0.25.0 milestone Mar 19, 2019
uilianries added a commit to uilianries/conan-package-tools that referenced this issue Mar 19, 2019
@uilianries
conan-io#354 Add CONAN_CONANFILE option
b52eee6 
Signed-off-by: Uilian Ries <uilianries@gmail.com>
@uilianries uilianries mentioned this issue Mar 19, 2019
Merged
4 tasks
uilianries added a commit to uilianries/conan-package-tools that referenced this issue Mar 19, 2019
@uilianries
conan-io#354 Add option description on README
d2d2b81 
Signed-off-by: Uilian Ries <uilianries@gmail.com>
uilianries added a commit to uilianries/conan-package-tools that referenced this issue Mar 19, 2019
@uilianries
conan-io#354 Support CONAN_CONANFILE option
5affc28 
- Add full support for custom conanfile name
- Add tests

Signed-off-by: Uilian Ries <uilianries@gmail.com>
uilianries added a commit to uilianries/conan-package-tools that referenced this issue Mar 19, 2019
@uilianries
conan-io#354 Fix boolean option
5469c9d 
Signed-off-by: Uilian Ries <uilianries@gmail.com>
lasote pushed a commit that referenced this issue Mar 20, 2019
@uilianries @lasote
#354 Add CONAN_CONANFILE option (#357)
2df763f 
* #354 Add CONAN_CONANFILE option

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

* #354 Add option description on README

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

* #354 Support CONAN_CONANFILE option

- Add full support for custom conanfile name
- Add tests

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

* #354 Fix boolean option

Signed-off-by: Uilian Ries <uilianries@gmail.com>
lasote added a commit that referenced this issue Mar 29, 2019
@lasote
0.25.0 (#362)
444a6d9 
* allow passing user-specified Docker args during create step

* rename parameter

* mention CONAN_DOCKER_RUN_OPTIONS envvar in readme

* add tests

* #343 Improve docker integration test

- Fix conan_pip_package. It should be a str by default
- Pass original printer to be re-used by Docker runner
- Add integration test to validate docker run options

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

* #343 Fix skip test when running docker

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

* Add GitHub settings (#345) (#349)

* Add GitHub settings

- Use standard Conan tags for issues
- Add stale config for timeout bot
- Add issue template

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

* Use Github settings from conanio/docs

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

* #345 Add PR template

- Add PR template to generate the changelog
- Add the contributing guide

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

* Trigger Github Settings (#352)

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

* #336 Forward login method (#344)

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

* Upload package dependencies (#334)

* #237 Update README

- Add description about the new feature

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

* #237 Upload all dependencies

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

* #237 Unit test to upload all deps

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

* #237 Fix env var name

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

* #237 Fix upload dependencies

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

* #237 Upload only built packages

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

* #237 Only upload when package is available

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

* Accept custom pip command (#347)

* #147 Support custom PIP command

- Add env var CONAN_PIP_COMMAND which allows to run a specific
  pip version, or even a pip binary path.

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

* #147 Check pip command before to run

- To avoid command injection, the custom pip command will be checked

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

* #147 Test dynamic pip version

- Check for current pip version before to customize CONAN_PIP_COMMAND

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

* #147 Ignore which pip on Windows

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

* #147 pip install quiet mode

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

* #147 Try to fix Windows tests

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

* #277 Accept Docker arguments as list

- both string and list are accepted as docker arguments
- Update docker test to use list

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

* #277 Fix options when downloading docker image

- Docker is executed in two cases. The first one is when
  we need to download the docker image and patch with the
  newest Conan version. The options were skipped there

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

* #354 Add CONAN_CONANFILE option (#357)

* #354 Add CONAN_CONANFILE option

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

* #354 Add option description on README

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

* #354 Support CONAN_CONANFILE option

- Add full support for custom conanfile name
- Add tests

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

* #354 Fix boolean option

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

* #355 Skip check credentials is boolean (#356)

- Parse the env var CONAN_SKIP_CHECK_CREDENTIALS as boolean

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

* fix azure pipelines branch detection (#346)

use variable BUILD_SOURCEBRANCH
BUILD_SOURCEBRANCHNAME only has the part after last /

* Feature/upload only recipe (#348)

* #153 Upload only the recipe

- Add CONAN_UPLOAD_ONLY_RECIPE env var, which set to skip
  all binary packages upload.

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

* #153 Test upload only the recipe

- get boolean value from environment variable is non-case sensitive now

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

* #153 Fix upload recipe argument

@madebr found a bug where the argument is wrong.

Co-Authored-By: uilianries <uilianries@gmail.com>

* #153 Fix unit test for upload recipe

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

* #153 Add test to check parameters

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

* #153 Fix conflict in README file

* Update Docker run example

- Use custom Docker network instead of using custom cache.

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

* Prepared for 1.15

* 0.25.0

* 1.15.0

* Fix Tox version (#364)

- Tox 3.8.1 is totally broken

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

* #361 Upload package with revisions (#363)

* #361 Upload package with revisions

- Package reference passed to be created is not the same
  retrieved from package id when the package is built.
  "foo/0.1@bar/testing" != "foo/0.1@bar/testing#<hash>"

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

* #361 Parse revision

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

* Fix broken tests for release 0.25.0 (#365)

* Fix broken tests for release 0.25.0

- Release branch is fragile, only specific tests are able to run,
  or even CPT behavior could change during the tests.

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

* Run Docker test as regular test

- Do not require Bintray account to run docker tests

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

* Clean some stuff and improve test running in local
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@uilianries uilianries

Labels
complex: low component: build Build helpers, build systems... priority: medium stage: review type: feature
Projects
None yet
Milestone
0.25.0
Development

Successfully merging a pull request may close this issue.

#354 Add CONAN_CONANFILE option uilianries/conan-package-tools
2 participants
@SSE4 @uilianries