Skip to content

Commit 6bbc764

Browse files
abdonrddiego-plan9
abdonrd
authored and
diego-plan9
committed
Consistent license across all the project (Qiskit#550)
* Consistent license across all the project * Update license * Update LICENSE.txt * Update licenses * Fix linter
1 parent 1b559a9 commit 6bbc764

File tree

219 files changed

+957
-2991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+957
-2991
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
1+
# Copyright 2017, IBM.
22
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
# =============================================================================
3+
# This source code is licensed under the Apache License, Version 2.0 found in
4+
# the LICENSE.txt file in the root directory of this source tree.
155

166
notifications:
177
email: false

LICENSE.md renamed to LICENSE.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Copyright 2017 IBM and its contributors
2+
13
Apache License
24
Version 2.0, January 2004
35
http://www.apache.org/licenses/
@@ -186,7 +188,7 @@
186188
same "printed page" as the copyright notice for easier
187189
identification within third-party archives.
188190

189-
Copyright 2017 IBM Inc.
191+
Copyright 2017 IBM and its contributors.
190192

191193
Licensed under the Apache License, Version 2.0 (the "License");
192194
you may not use this file except in compliance with the License.

‎Make.bat‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
:: Copyright 2017 IBM RESEARCH. All Rights Reserved.
2-
::
3-
:: Licensed under the Apache License, Version 2.0 (the "License");
4-
:: you may not use this file except in compliance with the License.
5-
:: You may obtain a copy of the License at
1+
:: Copyright 2017, IBM.
62
::
7-
:: http://www.apache.org/licenses/LICENSE-2.0
8-
::
9-
:: Unless required by applicable law or agreed to in writing, software
10-
:: distributed under the License is distributed on an "AS IS" BASIS,
11-
:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
:: See the License for the specific language governing permissions and
13-
:: limitations under the License.
14-
:: =============================================================================
3+
:: This source code is licensed under the Apache License, Version 2.0 found in
4+
:: the LICENSE.txt file in the root directory of this source tree.
155

166
@ECHO OFF
177
@SETLOCAL enabledelayedexpansion

‎Makefile‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
1+
# Copyright 2017, IBM.
22
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
# =============================================================================
3+
# This source code is licensed under the Apache License, Version 2.0 found in
4+
# the LICENSE.txt file in the root directory of this source tree.
5+
156
.PHONY: env env-dev lint test run doc
167

178
# Dependencies need to be installed on the Anaconda virtual environment.

‎README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,3 @@ Ali Javadi-Abhari, Paco Martin, Diego Moreda, Jesus Perez, Erick Winston and Chr
218218

219219
And continues to grow with the help and work of [many people](CONTRIBUTORS.md) who contribute
220220
to the project at different levels.
221-
222-
## License
223-
224-
This project uses the [Apache License Version 2.0 software license](https://www.apache.org/licenses/LICENSE-2.0).

‎appveyor.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
1+
# Copyright 2017, IBM.
22
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
# =============================================================================
3+
# This source code is licensed under the Apache License, Version 2.0 found in
4+
# the LICENSE.txt file in the root directory of this source tree.
155

166
version: 1.0.{build}
177

‎doc/ko/README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,3 @@ Ali Javadi-Abhari, Paco Martin, Diego Moreda, Jesus Perez, Erick Winston and Chr
144144

145145
And continues to grow with the help and work of [many people](https://github.com/QISKit/qiskit-core/tree/master/CONTRIBUTORS.md) who contribute
146146
to the project at different levels.
147-
148-
## License
149-
150-
본 프로젝트는 다음의 라이센스가 적용됩니다. [Apache License Version 2.0 software license](https://www.apache.org/licenses/LICENSE-2.0).
151-
152-

‎doc/zh/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,3 @@ Ali Javadi-Abhari, Paco Martin, Diego Moreda, Jesus Perez, Erick Winston and Chr
197197

198198
And continues to grow with the help and work of [many people](https://github.com/QISKit/qiskit-core/tree/master/CONTRIBUTORS.md) who contribute
199199
to the project at different levels.
200-
201-
## 版权许可证
202-
203-
此项目使用了 [Apache License Version 2.0 software license](https://www.apache.org/licenses/LICENSE-2.0)。

‎examples/python/basic_optimize.py‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
# coding=utf-8
21
# -*- coding: utf-8 -*-
32

4-
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
3+
# Copyright 2017, IBM.
54
#
6-
# Licensed under the Apache License, Version 2.0 (the "License");
7-
# you may not use this file except in compliance with the License.
8-
# You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
17-
# =============================================================================
5+
# This source code is licensed under the Apache License, Version 2.0 found in
6+
# the LICENSE.txt file in the root directory of this source tree.
187

198
"""Demo basic optimization: Remove Zero Rotations and Remove Double CNOTs.
209

‎examples/python/ghz.py‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3-
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
3+
# Copyright 2017, IBM.
44
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
# =============================================================================
5+
# This source code is licensed under the Apache License, Version 2.0 found in
6+
# the LICENSE.txt file in the root directory of this source tree.
177

188
"""
199
GHZ state example illustrating mapping onto the backend.

0 commit comments

Comments
 (0)