Merge pull request #24 from UNN-ITMM-Software/2020-preps-part-2

2020 preps #2
UNN-ITMM-Software · Jul 30, 2020 · 737dad7 · 737dad7
2 parents ecaaef0 + f7a08fd
commit 737dad7
Show file tree

Hide file tree

Showing 57 changed files with 31 additions and 55 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,5 @@
 [report]
 omit =
     */python?.?/*
-    */site-packages/nose/*
+    */site-packages/nose/*
+    */numpy/*
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,7 @@
 # General
 *.log
-log.txt
-.DS_Store
 .coverage
 
-# Gradle
-.gradle
-build
-gradle/
-gradlew
-gradlew.bat
-cpd.xml
-
-# IntelliJ IDEA
-out
-.idea
-*.iml
-*.ipr
-*.iws
-
-# Eclipse
-.classpath
-.settings
-.project
-bin
-
-# GWT
-bin/
-gwt-unitCache/
-war/
-*.html
-
-# Mac
+# macOS
 .DS_Store
 *.pyc
diff --git a/README.md b/README.md
@@ -1,53 +1,59 @@
-# Спецкурс "Agile Development". Python версия репозитория
+# Спецкурс Agile Development, Python Edition
 
+[![Join the chat][gitter-badge]][gitter-chat]
 [![Build Status][travis-badge]][travis]
 [![Coverage Status][coveralls-badge]][coveralls]
+[![License: CC BY-SA 4.0][license-badge]][license]
 
  - Нижегородский Государственный Университет им. Н.И. Лобачевского
  - Институт ИТММ, каф. МОСТ
- - __License__: Creative Commons Attribution-Share Alike 3.0 ([CC BY-SA 3.0][cc3])
 
 ## Ресурсы
 
 - [Таблица успеваемости][hall-of-fame]
 - Учебные материалы
-    - [Описания лабораторных работ][labs]
-    - [Контрольные вопросы][control-questions], [колхозная шпаргалка][cheatsheet] к ним
+    - [Описания лабораторных работ][lab-guide]
+    - [Контрольные вопросы][quiz], [колхозная шпаргалка][cheatsheet] к ним
     - [Экзаменационные вопросы][exam-questions]
 - Литература
     - Мика Мартин, Роберт Мартин "Принципы, паттерны и методики гибкой разработки на языке C#" ([pdf][book-agile])
     - Мартин Фаулер, Кент Бек и др. "Рефакторинг: улучшение существующего кода" ([pdf][book-refactoring])
 
 <!-- LINKS UPDATABLE -->
 [hall-of-fame]:     https://docs.google.com/spreadsheets/d/1Pt9i-UGUiFG8_tjnUjxmCqVjP9VHG9GJc1LNZQeGU_4/edit#gid=1613595355
-[exam-questions]:   https://docs.google.com/spreadsheets/d/1Pt9i-UGUiFG8_tjnUjxmCqVjP9VHG9GJc1LNZQeGU_4/edit#gid=827430395
 
 <!-- LINKS PERMANENT -->
-[cc3]:              http://creativecommons.org/licenses/by-sa/3.0/
+[license]:          http://creativecommons.org/licenses/by-sa/4.0/
+[license-badge]:    https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg
 [travis]:           https://travis-ci.org/UNN-ITMM-Software/agile-course-practice-python
 [travis-badge]:     https://travis-ci.org/UNN-ITMM-Software/agile-course-practice-python.svg?branch=master
-[control-questions]: https://github.com/UNN-VMK-Software/agile-course-theory/blob/master/slides/control-questions.md
-[cheatsheet]:       https://docs.google.com/document/d/1QhdJOnSw-Gn_-WM9RWLzmxZMrWTB4EbyTkaNBWMGA3Y/edit
+[coveralls]:        https://coveralls.io/github/UNN-ITMM-Software/agile-course-practice-python?branch=master
+[coveralls-badge]:  https://coveralls.io/repos/github/UNN-ITMM-Software/agile-course-practice-python/badge.svg?branch=master
+[gitter-chat]:      https://gitter.im/agile-course-practice-python/community
+[gitter-badge]:     https://badges.gitter.im/Lobby.svg
+
 [book-agile]:       http://www.books.ru/books/printsipy-patterny-i-metodiki-gibkoi-razrabotki-na-yazyke-c-fail-pdf-864714/?show=1
 [book-refactoring]: http://www.books.ru/books/refaktoring-uluchshenie-sushchestvuyushchego-koda-fail-pdf-552092/?show=1
 
-<!-- CLEANUP -->
-[coveralls]:        https://coveralls.io/github/UNN-ITMM-Software/agile-course-practice-python?branch=master
-[coveralls-badge]:  https://coveralls.io/repos/github/UNN-ITMM-Software/agile-course-practice-python/badge.svg?branch=master
-[labs]:             https://github.com/UNN-VMK-Software/agile-course-practice/tree/master/docs
+[lab-guide]:        https://github.com/UNN-VMK-Software/agile-course-practice-python/tree/master/docs
+[quiz]:             https://github.com/UNN-VMK-Software/agile-course-theory/blob/master/slides/control-questions.md
+[cheatsheet]:       https://docs.google.com/document/d/1QhdJOnSw-Gn_-WM9RWLzmxZMrWTB4EbyTkaNBWMGA3Y/edit
+[exam-questions]:   https://docs.google.com/spreadsheets/d/1Pt9i-UGUiFG8_tjnUjxmCqVjP9VHG9GJc1LNZQeGU_4/edit#gid=827430395
 
 <!-- NOTES
 
 TODO
 
-    - infrastructure
-        - refresh links
-        - enable GitterChat
-        - update lab guides for Python
     - code
-        - make code coverage report from nosetests look the same both locally and on Travis-CI
-        - enable code coverage
         - migrate to newer version of Python
+        - remove log files in the end of the test
+        - overall code cleaning
+        - implement one more topic as an excersize
+    - infrastructure
+        - update lab guides for Python
+        - whether and how to use Python virtualenv
+        - change license to MIT or something like that
+        - also enable macOS testing on Travis CI
 
 NOTES
 
@@ -64,6 +70,4 @@ NOTES
    89  pip install configparser==3.5
    99  PATH="/Users/kirill-personal/Library/Python/2.7/bin:$PATH"
 
-  101  flake8 --max-line-length=110 code
-
 -->
diff --git a/code/khanova-tatiana/README.md → code/color_space/README.md b/code/khanova-tatiana/README.md → code/color_space/README.md
@@ -28,4 +28,3 @@ TBD
 [RGB]: https://en.wikipedia.org/wiki/RGB_color_model
 [LAB]: https://en.wikipedia.org/wiki/Lab_color_space
 [doc]: http://docs.opencv.org/2.4.11/modules/imgproc/doc/miscellaneous_transformations.html#cvtcolor
-
diff --git a/code/kainov-oleg/src/cliview/__init__.py → code/color_space/src/model/__init__.py b/code/kainov-oleg/src/cliview/__init__.py → code/color_space/src/model/__init__.py
diff --git a/code/khanova-tatiana/src/model/color.py → code/color_space/src/model/color.py b/code/khanova-tatiana/src/model/color.py → code/color_space/src/model/color.py
diff --git a/.../khanova-tatiana/src/model/color_space.py → code/color_space/src/model/color_space.py b/.../khanova-tatiana/src/model/color_space.py → code/color_space/src/model/color_space.py
diff --git a/...atiana/src/model/color_space_converter.py → ..._space/src/model/color_space_converter.py b/...atiana/src/model/color_space_converter.py → ..._space/src/model/color_space_converter.py
diff --git a/...ova-tatiana/src/model/test_color_space.py → ...color_space/src/model/test_color_space.py b/...ova-tatiana/src/model/test_color_space.py → ...color_space/src/model/test_color_space.py
diff --git a/code/khanova-tatiana/src/model/utility.py → code/color_space/src/model/utility.py b/code/khanova-tatiana/src/model/utility.py → code/color_space/src/model/utility.py
diff --git a/code/kainov-oleg/src/guiview/__init__.py → code/color_space/src/my_logger/__init__.py b/code/kainov-oleg/src/guiview/__init__.py → code/color_space/src/my_logger/__init__.py
diff --git a/.../khanova-tatiana/src/my_logger/ilogger.py → code/color_space/src/my_logger/ilogger.py b/.../khanova-tatiana/src/my_logger/ilogger.py → code/color_space/src/my_logger/ilogger.py
diff --git a/...va-tatiana/src/my_logger/mockup_logger.py → ...olor_space/src/my_logger/mockup_logger.py b/...va-tatiana/src/my_logger/mockup_logger.py → ...olor_space/src/my_logger/mockup_logger.py
diff --git a/...nova-tatiana/src/my_logger/real_logger.py → .../color_space/src/my_logger/real_logger.py b/...nova-tatiana/src/my_logger/real_logger.py → .../color_space/src/my_logger/real_logger.py
@@ -2,7 +2,7 @@
 
 
 class Logger(ILogger):
-    def __init__(self, filename="log.txt"):
+    def __init__(self, filename="one_more.log"):
         self.log_filename = filename
         open(filename, 'w').close()
 

diff --git a/...nova-tatiana/src/my_logger/test_logger.py → .../color_space/src/my_logger/test_logger.py b/...nova-tatiana/src/my_logger/test_logger.py → .../color_space/src/my_logger/test_logger.py
diff --git a/code/khanova-tatiana/src/run_converter.py → code/color_space/src/run_converter.py b/code/khanova-tatiana/src/run_converter.py → code/color_space/src/run_converter.py
diff --git a/code/kainov-oleg/src/logger/__init__.py → code/color_space/src/view/__init__.py b/code/kainov-oleg/src/logger/__init__.py → code/color_space/src/view/__init__.py
diff --git a/code/khanova-tatiana/src/view/view.py → code/color_space/src/view/view.py b/code/khanova-tatiana/src/view/view.py → code/color_space/src/view/view.py
diff --git a/code/kainov-oleg/src/model/__init__.py → code/color_space/src/viewmodel/__init__.py b/code/kainov-oleg/src/model/__init__.py → code/color_space/src/viewmodel/__init__.py
diff --git a/...-tatiana/src/viewmodel/test_view_model.py → ...or_space/src/viewmodel/test_view_model.py b/...-tatiana/src/viewmodel/test_view_model.py → ...or_space/src/viewmodel/test_view_model.py
diff --git a/...anova-tatiana/src/viewmodel/view_model.py → code/color_space/src/viewmodel/view_model.py b/...anova-tatiana/src/viewmodel/view_model.py → code/color_space/src/viewmodel/view_model.py
diff --git a/code/kainov-oleg/README.md → code/fraction/README.md b/code/kainov-oleg/README.md → code/fraction/README.md
diff --git a/code/kainov-oleg/src/viewmodel/__init__.py → code/fraction/src/cliview/__init__.py b/code/kainov-oleg/src/viewmodel/__init__.py → code/fraction/src/cliview/__init__.py
diff --git a/code/kainov-oleg/src/cliview/cli_view.py → code/fraction/src/cliview/cli_view.py b/code/kainov-oleg/src/cliview/cli_view.py → code/fraction/src/cliview/cli_view.py
diff --git a/code/khanova-tatiana/src/model/__init__.py → code/fraction/src/guiview/__init__.py b/code/khanova-tatiana/src/model/__init__.py → code/fraction/src/guiview/__init__.py
diff --git a/code/kainov-oleg/src/guiview/gui_view.py → code/fraction/src/guiview/gui_view.py b/code/kainov-oleg/src/guiview/gui_view.py → code/fraction/src/guiview/gui_view.py
diff --git a/...khanova-tatiana/src/my_logger/__init__.py → code/fraction/src/logger/__init__.py b/...khanova-tatiana/src/my_logger/__init__.py → code/fraction/src/logger/__init__.py
diff --git a/code/kainov-oleg/src/logger/fakelogger.py → code/fraction/src/logger/fakelogger.py b/code/kainov-oleg/src/logger/fakelogger.py → code/fraction/src/logger/fakelogger.py
diff --git a/code/kainov-oleg/src/logger/ilogger.py → code/fraction/src/logger/ilogger.py b/code/kainov-oleg/src/logger/ilogger.py → code/fraction/src/logger/ilogger.py
diff --git a/code/kainov-oleg/src/logger/reallogger.py → code/fraction/src/logger/reallogger.py b/code/kainov-oleg/src/logger/reallogger.py → code/fraction/src/logger/reallogger.py
diff --git a/...kainov-oleg/src/logger/test_fakelogger.py → code/fraction/src/logger/test_fakelogger.py b/...kainov-oleg/src/logger/test_fakelogger.py → code/fraction/src/logger/test_fakelogger.py
diff --git a/code/kainov-oleg/src/main.py → code/fraction/src/main.py b/code/kainov-oleg/src/main.py → code/fraction/src/main.py
diff --git a/code/khanova-tatiana/src/view/__init__.py → code/fraction/src/model/__init__.py b/code/khanova-tatiana/src/view/__init__.py → code/fraction/src/model/__init__.py
diff --git a/code/kainov-oleg/src/model/fraction.py → code/fraction/src/model/fraction.py b/code/kainov-oleg/src/model/fraction.py → code/fraction/src/model/fraction.py
diff --git a/code/kainov-oleg/src/model/rational_math.py → code/fraction/src/model/rational_math.py b/code/kainov-oleg/src/model/rational_math.py → code/fraction/src/model/rational_math.py
diff --git a/code/kainov-oleg/src/model/test_fraction.py → code/fraction/src/model/test_fraction.py b/code/kainov-oleg/src/model/test_fraction.py → code/fraction/src/model/test_fraction.py
diff --git a/...inov-oleg/src/model/test_rational_math.py → .../fraction/src/model/test_rational_math.py b/...inov-oleg/src/model/test_rational_math.py → .../fraction/src/model/test_rational_math.py
diff --git a/...khanova-tatiana/src/viewmodel/__init__.py → code/fraction/src/viewmodel/__init__.py b/...khanova-tatiana/src/viewmodel/__init__.py → code/fraction/src/viewmodel/__init__.py
diff --git a/...inov-oleg/src/viewmodel/test_viewmodel.py → .../fraction/src/viewmodel/test_viewmodel.py b/...inov-oleg/src/viewmodel/test_viewmodel.py → .../fraction/src/viewmodel/test_viewmodel.py
diff --git a/code/kainov-oleg/src/viewmodel/viewmodel.py → code/fraction/src/viewmodel/viewmodel.py b/code/kainov-oleg/src/viewmodel/viewmodel.py → code/fraction/src/viewmodel/viewmodel.py
diff --git a/code/timonova-anastasia/README.md → code/matrix/README.md b/code/timonova-anastasia/README.md → code/matrix/README.md
@@ -4,7 +4,7 @@
 
  - Тимонова Анастасия
  - ННГУ, ИИТММ, каф. МОСТ, группа М0816-1
-  
+
 ### Задание:
 1. Разработать приложение для заполнения матрицы и вычисления её детерминанта.
 2. Для матриц более высокого порядка, чем 2х2 или 3х3, при необходимости, можно использовать метод Гаусса для повышения эффективности вычислений.

diff --git a/code/timonova-anastasia/src/__init__.py → code/matrix/src/__init__.py b/code/timonova-anastasia/src/__init__.py → code/matrix/src/__init__.py
diff --git a/code/timonova-anastasia/src/main.py → code/matrix/src/main.py b/code/timonova-anastasia/src/main.py → code/matrix/src/main.py
diff --git a/...ova-anastasia/src/my_gui_view/__init__.py → code/matrix/src/my_gui_view/__init__.py b/...ova-anastasia/src/my_gui_view/__init__.py → code/matrix/src/my_gui_view/__init__.py
diff --git a/...ova-anastasia/src/my_gui_view/gui_view.py → code/matrix/src/my_gui_view/gui_view.py b/...ova-anastasia/src/my_gui_view/gui_view.py → code/matrix/src/my_gui_view/gui_view.py
diff --git a/...astasia/src/my_infrastructure/__init__.py → .../matrix/src/my_infrastructure/__init__.py b/...astasia/src/my_infrastructure/__init__.py → .../matrix/src/my_infrastructure/__init__.py
diff --git a/...asia/src/my_infrastructure/fake_logger.py → ...trix/src/my_infrastructure/fake_logger.py b/...asia/src/my_infrastructure/fake_logger.py → ...trix/src/my_infrastructure/fake_logger.py
diff --git a/...nastasia/src/my_infrastructure/ilogger.py → code/matrix/src/my_infrastructure/ilogger.py b/...nastasia/src/my_infrastructure/ilogger.py → code/matrix/src/my_infrastructure/ilogger.py
diff --git a/...asia/src/my_infrastructure/real_logger.py → ...trix/src/my_infrastructure/real_logger.py b/...asia/src/my_infrastructure/real_logger.py → ...trix/src/my_infrastructure/real_logger.py
diff --git a/.../src/my_infrastructure/test_for_logger.py → .../src/my_infrastructure/test_for_logger.py b/.../src/my_infrastructure/test_for_logger.py → .../src/my_infrastructure/test_for_logger.py
diff --git a/...monova-anastasia/src/my_model/__init__.py → code/matrix/src/my_model/__init__.py b/...monova-anastasia/src/my_model/__init__.py → code/matrix/src/my_model/__init__.py
diff --git a/...timonova-anastasia/src/my_model/matrix.py → code/matrix/src/my_model/matrix.py b/...timonova-anastasia/src/my_model/matrix.py → code/matrix/src/my_model/matrix.py
diff --git a/...nastasia/src/my_model/tests_for_matrix.py → code/matrix/src/my_model/tests_for_matrix.py b/...nastasia/src/my_model/tests_for_matrix.py → code/matrix/src/my_model/tests_for_matrix.py
diff --git a/...a-anastasia/src/my_view_model/__init__.py → code/matrix/src/my_view_model/__init__.py b/...a-anastasia/src/my_view_model/__init__.py → code/matrix/src/my_view_model/__init__.py
diff --git a/.../src/my_view_model/tests_for_viewmodel.py → .../src/my_view_model/tests_for_viewmodel.py b/.../src/my_view_model/tests_for_viewmodel.py → .../src/my_view_model/tests_for_viewmodel.py
diff --git a/...anastasia/src/my_view_model/view_model.py → code/matrix/src/my_view_model/view_model.py b/...anastasia/src/my_view_model/view_model.py → code/matrix/src/my_view_model/view_model.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 nose==1.3.7
+zipp==0.5.0
 flake8==2.6.2
 coverage==4.5.4
 coveralls==1.0
 pep8==1.7.1
-pep8-naming==0.3.3
+pep8-naming==0.3.3