License changed to Apache 2.0, updated copyright.

alcatraz-rm · Jul 25, 2018 · 8b231dc · 8b231dc
1 parent 99116b2
commit 8b231dc
Show file tree

Hide file tree

Showing 17 changed files with 373 additions and 49 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Notice b/Notice
@@ -0,0 +1,30 @@
+Copyright © 2018. All rights reserved.
+Author: German Yakimov
+
+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.
+
+
+---------------------------------------------------------------------------
+
+Лицензировано согласно Лицензии Apache, Версия 2.0 ("Лицензия");
+вы можете использовать этот файл только в соответствии с Лицензией.
+Вы можете найти копию Лицензии по адресу
+
+    http://www.apache.org/licenses/LICENSE-2.0.
+
+За исключением случаев, когда это регламентировано существующим
+законодательством или если это не оговорено в письменном соглашении,
+программное обеспечение распространяемое на условиях данной Лицензии,
+предоставляется "КАК ЕСТЬ" и любые явные или неявные ГАРАНТИИ
+ОТВЕРГАЮТСЯ. Информацию об основных правах и ограничениях, применяемых
+к определенному языку согласно Лицензии, вы можете найти в данной Лицензии.
diff --git a/Python/Demo.py b/Python/Demo.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import platform
 import sys

diff --git a/Python/Services/Classifier.py b/Python/Services/Classifier.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import os
 from sklearn.externals import joblib

diff --git a/Python/Services/DatabaseCursor.py b/Python/Services/DatabaseCursor.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import sqlite3
 import os

diff --git a/Python/Services/DocumentPreparer.py b/Python/Services/DocumentPreparer.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 from Python.Services.Logger import Logger
 

diff --git a/Python/Services/FileReader.py b/Python/Services/FileReader.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import chardet
 from PyQt5.QtWidgets import QFileDialog, QWidget

diff --git a/Python/Services/Lemmatizer/Lemmatizer.py b/Python/Services/Lemmatizer/Lemmatizer.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 from string import ascii_letters
 import re

diff --git a/Python/Services/Logger.py b/Python/Services/Logger.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import os
 import sys

diff --git a/Python/Services/NgramAnalyzer.py b/Python/Services/NgramAnalyzer.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import os
 import warnings

diff --git a/Python/Services/Singleton/Singleton.py b/Python/Services/Singleton/Singleton.py
@@ -1,3 +1,8 @@
+# Copyright © 2018. All rights reserved.
+# Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
+# License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
+
 
 class Singleton(type):
     _instances = {}

diff --git a/Python/Services/SpeechRecognizer.py b/Python/Services/SpeechRecognizer.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import speech_recognition as sr
 from Python.Services.Logger import Logger

diff --git a/Python/Services/SpellChecker.py b/Python/Services/SpellChecker.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import requests
 from Python.Services.Logger import Logger

diff --git a/Python/Services/TextWeightCounter.py b/Python/Services/TextWeightCounter.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import os
 import csv

diff --git a/Python/Tests/SystemTester.py b/Python/Tests/SystemTester.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import csv
 import json

diff --git a/Python/TextTonalAnalyzer.py b/Python/TextTonalAnalyzer.py
@@ -1,7 +1,7 @@
-# Copyright © 2017-2018. All rights reserved.
+# Copyright © 2018. All rights reserved.
 # Author: German Yakimov
+# Licensed under the Apache License, Version 2.0
 # License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
-# Contacts: german@yakimov.su
 
 import os
 import csv

diff --git a/README.md b/README.md
@@ -71,7 +71,23 @@ Sentiment analysis (анализ тональности) — это област
     <li>https://nlpub.ru/Ресурсы - материалы для NLP (дата обращения: 23.07.18)</li>
 </ul>
 
-#### Copyright © 2017-2018. All rights reserved.
-#### Authors: German Yakimov
+### Лицензия
+
+Лицензировано согласно Лицензии Apache, Версия 2.0 ("Лицензия"); 
+вы можете использовать этот файл только в соответствии с Лицензией. 
+Вы можете найти копию Лицензии по адресу 
+
+    http://www.apache.org/licenses/LICENSE-2.0. 
+
+За исключением случаев, когда это регламентировано существующим 
+законодательством или если это не оговорено в письменном соглашении,
+программное обеспечение распространяемое на условиях данной Лицензии,
+предоставляется "КАК ЕСТЬ" и любые явные или неявные ГАРАНТИИ 
+ОТВЕРГАЮТСЯ. Информацию об основных правах и ограничениях, применяемых
+к определенному языку согласно Лицензии, вы можете найти в данной Лицензии.
+
+
+#### Copyright © 2018. All rights reserved.
+#### Author: German Yakimov
 #### License: https://github.com/GermanYakimov/Text_tone_analyzer/blob/master/LICENSE
 #### Contacts: german@yakimov.su