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

1 more step to remove nose #7952

Merged
merged 4 commits into from Oct 28, 2020
Merged

Conversation

lasote
Copy link
Contributor

@lasote lasote commented Oct 27, 2020

Changelog: Feature: Changed recommended way to launch test suite, with pytest over nosetests.
Docs: Omit

Doesn't need docs, just README instructions

  • Added pytest custom marks in addition to the current nose attrs.
  • Changed readme and tox to use pytest as the recommended way.

What's next?

Part of #6527

@lasote lasote requested review from jgsogo, czoido and memsharded Oct 27, 2020
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

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

Looks good!

conans/test/functional/build_helpers/cmake_flags_test.py Outdated Show resolved Hide resolved
Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

In order to test it in the CI, I'd recommend to rename the Jenkinsfile and create a different multibranch project in Jenkins. It could also need a matching branch (using pytest) of the conan_ci library.

Existing Jenkins project will run the current Jenkinsfile with the current default conan_ci branch. New Jenkins project will be configured with the new Jenkinsfile and a different branch of the conan_ci library.

As this PR evolves or it is merged in develop, the old CI project will stop to run (no matching Jenkinsfile) and the new one will take care of pull-requests and changes. Eventually, when all PRs are rebased, we might consider using the previous default branch for conan_ci.


Following this approach, we can remove the @attr(...) in this PR too, remove nose from the requirements,... and check it works with pytest.

@lasote
Copy link
Contributor Author

lasote commented Oct 27, 2020

I think it is easier to open first a PR in the Jenkins library to add a new function that will cause "pytest" to run instead of "nosetests". Then modify here the Jenkinsfile to call that. The "new pytest" library will keep evolving with new pipelines to run first only python tests, then tools, and so on (like the pictures at conan-io/conan_ci_jenkins#10) so when merged, It will be automatically enabled (on each branch). Eventually, we could remove the old library that launches nosetest.

@lasote
Copy link
Contributor Author

lasote commented Oct 27, 2020

Also, I think it is better to merge small chunks to avoid a gigantic PR. I'll fix the imports order and I vote to merge this to develop (because it doesn't affect anything but recommending to use pytests)

@memsharded
Copy link
Member

Also, I think it is better to merge small chunks to avoid a gigantic PR. I'll fix the imports order and I vote to merge this to develop (because it doesn't affect anything but recommending to use pytests)

Yeah, I agree, we can go step by step, the CI job can an is better to be done in another PR.

@memsharded memsharded added this to the 1.31 milestone Oct 28, 2020
czoido
czoido approved these changes Oct 28, 2020
@czoido czoido merged commit 4eb8f02 into conan-io:develop Oct 28, 2020
2 checks passed
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.

None yet

4 participants