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

Update python to 2.7.11 #2171

Merged
12 commits merged into from Mar 2, 2016
Merged

Update python to 2.7.11 #2171

12 commits merged into from Mar 2, 2016

Conversation

ghost
Copy link

@ghost ghost commented Mar 1, 2016

Ported from 8_0_X/next.

David Abdurachmanov and others added 12 commits February 2, 2016 09:03
python: disable parallel build
17980eb 
Older versions of Python contain a bug, which makes parallel builds
unstable.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit 4205179)
python: update version: 2.7.6 -> 2.7.11; add dependency on libffi
53fec4f 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit bebe819)
python: add lib and lib64 directories to LDFLAGS
7d4aaab 
Depending on package libraries are in lib or lib64 directories. Red Hat
policies require libraries to be in lib64 directoryon 64-bit systems,
which we don't enforce in CMSDIST.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit 3a16fde)
libffi,libffi-toolfile: new external (needed for Python)
eb70376 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit f04554b)
libffi: add ../lib64 to LD_LIBRARY_PATH
0a9f52f 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit 9317db1)
openssl: match with openssl-bootstrap
006009d 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit 562c080)
openssl,openssl-bootstrap: keep only 1.0.2d; fix CA bundle
6ee6370 
Use 1.0.2d even for SLC6. In newer glibc versions __secure_getenv was
renamed to secure_getenv, thus we just rename it back on SLC6.

Include a fix for PR3979.

Set /etc/pki/tls as openssldir, but make sure that installation step
does not touch the directory. This solves the problem where das_client.py
was not able to verify cmsweb certificate.

(cherry picked from commit 535fb83, but
openssl-bootstrap.spec was kept unmodified)

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
graphviz: bump to 2.38.0; use libjpeg-turbo
16a6639 
Use libjpeg-turbo instead of deprecated libjpg.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit d943a78)
python: move from db6 to db4
e85f382 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
graphviz: move from libjpeg-turbo to libjpg
f1ce035 
Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
cmssw-tool-conf: add missing libffi-toolfile
05e9790 
libffi-toolfile was added in 9dc437e for Python 2.7.11, but it
was never added to cmssw-tool-conf thus causing compilation issues in
CMSSW.

Adds dependency on libffi-toolfile.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
(cherry picked from commit 1c10d26)

Conflicts:

	cmssw-tool-conf.spec
@cmsbuild
Merge branch 'stable-python-2-7-11' of git://github.com/davidlt/cmsdi…
ea22d1e 
…st into IB/CMSSW_8_1_X/stable
@ghost
Copy link
Author

ghost commented Mar 1, 2016

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 1, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/cmsdist-test-pr/119/console
https://cmssdt.cern.ch/jenkins/job/cmsdist-test-pr/120/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 1, 2016

A new Pull Request was created by @Degano (Alessandro Degano) for branch IB/CMSSW_8_1_X/stable.

@cmsbuild, @smuzaffar, @Degano, @iahmad-khan, @davidlange6 can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2016

-1

Tested at: ea22d1e
I found errors in the following unit tests:

---> test DetectorDescriptionRegressionTestDOMCount had ERRORS
---> test runtestTqafTopEventSelection had ERRORS
---> test runtestSimCalorimetryHGCalSimProducers had ERRORS
---> test runtestRecoLocalCaloHGCalRecProducers had ERRORS

you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-2171/120/summary.html

@ghost
Copy link
Author

ghost commented Mar 2, 2016

Unit tests reported failing are unrelated to this PR.

ghost pushed a commit that referenced this pull request Mar 2, 2016
@aledegano
Merge pull request #2171 from degano/python2711_81X
c5ecf9b 
Update python to 2.7.11
@ghost ghost merged commit c5ecf9b into cms-sw:IB/CMSSW_8_1_X/stable Mar 2, 2016
@ghost ghost deleted the python2711_81X branch March 2, 2016 09:41
This pull request was closed.
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
externals-pending orp-pending pending-signatures tests-rejected
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@cmsbuild