[llvm-branch-commits] [llvm-branch] r368414 - Merging r368315:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Aug  9 01:53:00 2019
New Revision: 368414

URL: http://llvm.org/viewvc/llvm-project?rev=368414&view=rev
Log:
Merging r368315:
------------------------------------------------------------------------
r368315 | tstellar | 2019-08-08 19:23:33 +0200 (Thu, 08 Aug 2019) | 21 lines

lit: Use a License classifier that pypi will accept

Summary:
'OSI Approved :: Apache-2.0 with LLVM exception' is not a valid
classifier.  'OSI Approved :: Apache Software License' is the closest
fit for the new license, so we've decided to use this one.

The classifiers seem to only be used for searching on the pypi website,
so this does not actually change the license of the code.
We still pass 'Apache-2.0 with LLVM exception' as the license to setup(),
and this appears alongside the classifier on the pypi webpage for lit.

Reviewers: chandlerc, ddunbar, joerg

Reviewed By: joerg

Subscribers: delcypher, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D65762
------------------------------------------------------------------------

Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/utils/lit/setup.py

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  9 01:53:00 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367417,367662,367753,367846-367847,367898,367941,368004
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367030,367062,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367417,367662,367753,367846-367847,367898,367941,368004,368315

Modified: llvm/branches/release_90/utils/lit/setup.py
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/lit/setup.py?rev=368414&r1=368413&r2=368414&view=diff
==============================================================================
--- llvm/branches/release_90/utils/lit/setup.py (original)
+++ llvm/branches/release_90/utils/lit/setup.py Fri Aug  9 01:53:00 2019
@@ -60,7 +60,7 @@ https://github.com/llvm/llvm-project/tre
         'Development Status :: 3 - Alpha',
         'Environment :: Console',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache-2.0 with LLVM exception',
+        'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',