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

Update cppCommentSkipper.py #34562

Merged
merged 1 commit into from
Jul 21, 2021
Merged

Update cppCommentSkipper.py #34562

merged 1 commit into from
Jul 21, 2021

Conversation

iarspider
Copy link
Contributor

@iarspider iarspider commented Jul 20, 2021

PR description:

Change string.find(foo, bar) into foo.find(bar), string.replace(foo, bar, baz, n) into foo.replace(bar, baz, n). The new syntax was already present in 2.7 series, and was removed in 3.x

Saw an error message in this log: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/17008/console

13:37:18 + cmsCodeRulesChecker.py -s /data/cmsbld/jenkins/workspace/ib-run-pr-tests/codeRules -r 1,3
13:37:19 Traceback (most recent call last):
13:37:19   File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-07-19-1100/bin/slc7_amd64_gcc900/cmsCodeRulesChecker.py", line 220, in <module>
13:37:19     result = runRules(ruleNumbers, checkPath)
13:37:19   File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-07-19-1100/bin/slc7_amd64_gcc900/cmsCodeRulesChecker.py", line 89, in runRules
13:37:19     filesLinesList = skipper(filesLinesList)
13:37:19   File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-07-19-1100/python/Utilities/ReleaseScripts/commentSkipper/commentSkipper.py", line 21, in filter
13:37:19     fileList = cppCommentSkipper.filterFiles(fileList)
13:37:19   File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-07-19-1100/python/Utilities/ReleaseScripts/commentSkipper/cppCommentSkipper.py", line 11, in filterFiles
13:37:19     files.append((file, filterFile(file)))
13:37:19   File "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-07-19-1100/python/Utilities/ReleaseScripts/commentSkipper/cppCommentSkipper.py", line 35, in filterFile
13:37:19     lines[i] = string.replace(lines[i], lines[i][j:],'\n', 1)
13:37:19 AttributeError: module 'string' has no attribute 'replace'

Change `string.find(foo, bar)` into `foo.find(bar)`, `string.replace(foo, bar, baz, n)` into `foo.replace(bar, baz, n)`. The new syntax was already present in 2.7 series, and was removed in 3.x
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34562/24098

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @iarspider for master.

It involves the following packages:

  • Utilities/ReleaseScripts (core)

@makortel, @smuzaffar, @cmsbuild, @Dr15Jones can you please review it and eventually sign? Thanks.
@wddgit this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

@Dr15Jones
Copy link
Contributor

Please test

@iarspider
Copy link
Contributor Author

The build job (https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/17018/) failed for unrelated reason (failed to compile tmp/slc7_amd64_gcc900/src/HeterogeneousCore/SonicTriton/plugins/HeterogenousCoreSonicTriton_plugins/TritonService.cc.o), but this did not get propageted to github.

@smuzaffar
Copy link
Contributor

please test
new IB is available with the external

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3718c9/17032/summary.html
COMMIT: bb7e3c2
CMSSW: CMSSW_12_0_X_2021-07-20-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34562/17032/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3718c9/17032/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3718c9/17032/git-merge-result

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2996268
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2996239
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@makortel
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy, @perrotta (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Jul 21, 2021

+1

@cmsbuild cmsbuild merged commit e0e387d into cms-sw:master Jul 21, 2021
@iarspider iarspider deleted the patch-2 branch July 21, 2021 13:48
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.

None yet

6 participants