Repository: Qiskit/qiskit

Issue:
License header for qiskit/tools/apps/optimization.py
<!-- ⚠️ If you do not respect this template, your issue will be closed -->
<!-- ⚠️ Make sure to browse the opened and closed issues -->

### Informations

After merging #724, the license header for `qiskit/tools/apps/optimization.py` has been reverted to "old" one - was this on purpose? @ajavadia , @nonhermitian can you comment and take action if appropiate?






Discussion:
Labelling as a bug, even if the change is intended, the date should be updated to include 2018.
Yes, the old license was added accidentally it seems.

Resolving patch:
diff --git a/qiskit/tools/apps/optimization.py b/qiskit/tools/apps/optimization.py
--- a/qiskit/tools/apps/optimization.py
+++ b/qiskit/tools/apps/optimization.py
@@ -1,20 +1,11 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=unused-import,invalid-name
 
-# Copyright 2017 IBM RESEARCH. All Rights Reserved.
+# Copyright 2018, IBM.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =============================================================================
+# This source code is licensed under the Apache License, Version 2.0 found in
+# the LICENSE.txt file in the root directory of this source tree.
+
 """
 These are tools that are used in the classical optimization and chemistry
 tutorials
diff --git a/qiskit/transpiler/_transpilererror.py b/qiskit/transpiler/_transpilererror.py
--- a/qiskit/transpiler/_transpilererror.py
+++ b/qiskit/transpiler/_transpilererror.py
@@ -1,19 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2018 IBM RESEARCH. All Rights Reserved.
+# Copyright 2018, IBM.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =============================================================================
+# This source code is licensed under the Apache License, Version 2.0 found in
+# the LICENSE.txt file in the root directory of this source tree.
 
 """
 Exception for errors raised by the transpiler.


Test patch:
diff --git a/test/python/test_load_qasm.py b/test/python/test_load_qasm.py
--- a/test/python/test_load_qasm.py
+++ b/test/python/test_load_qasm.py
@@ -1,19 +1,9 @@
 # -*- coding: utf-8 -*-
+
+# Copyright 2017, IBM.
 #
-# Copyright 2017 IBM RESEARCH. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =============================================================================
+# This source code is licensed under the Apache License, Version 2.0 found in
+# the LICENSE.txt file in the root directory of this source tree.
 
 
 """Test cases for the load_qasm_file and load_qasm_string method."""