Change project structure

Author: gyermolenko

.travis.yml

@@ -6,23 +6,18 @@ sudo: false
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
-# Disabled for now since cause more pain than gain
-#  - "pypy"
-#  - "pypy3"
+  - "3.7"
 
 cache:
   - pip
 
 install:
-  - travis_retry pip install -q codecov
-  - pip install flake8
   - pip install -r requirements-dev.txt
 
 script:
-  - pytest --doctest-modules behavioral/ creational/ dft/ fundamental/ other/ structural/  # exclude tests/
+  - pytest --doctest-modules patterns/
   - pytest -s -vv --cov=. --log-level=INFO tests/
   # Actually run all the scripts, contributing to coverage
   - PYTHONPATH=. ./run_all.sh

behavioral/__init__.py renamed to patterns/__init__.py

@@ -1,2 +1,5 @@
+-e .
 pytest~=4.1
 pytest-cov~=2.6
+flake8~=3.6
+codecov~=2.0

creational/__init__.py renamed to patterns/behavioral/__init__.py

@@ -0,0 +1,14 @@
+from setuptools import setup
+
+setup(
+    name='python-patterns',
+    description='A collection of design patterns and idioms in Python.',
+    classifiers=[
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+    ],
+)

behavioral/catalog.py renamed to patterns/behavioral/catalog.py

@@ -3,7 +3,7 @@
 import os
 import shutil
 import unittest
-from behavioral.command import MoveFileCommand
+from patterns.behavioral.command import MoveFileCommand
 
 
 class CommandTest(unittest.TestCase):
@@ -23,8 +23,8 @@ def setUpClass(self):
         - get the temporary test directory
         - and initializes the command stack.
         """
-        os.mkdir('tests/test_command')
-        open('tests/test_command/foo.txt', 'w').close()
+        os.mkdir('tests/behavioral/test_command')
+        open('tests/behavioral/test_command/foo.txt', 'w').close()
         self.__get_test_directory()
         self.command_stack = []
         self.command_stack.append(
@@ -56,4 +56,4 @@ def tearDownClass(self):
         """
         Remove the temporary directory /test_command and its content.
         """
-        shutil.rmtree('tests/test_command')
+        shutil.rmtree('tests/behavioral/test_command')

behavioral/chain.py renamed to patterns/behavioral/chain.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from behavioral.observer import Subject, Data, DecimalViewer, HexViewer
+from patterns.behavioral.observer import Subject, Data, DecimalViewer, HexViewer
 
 try:
     from unittest.mock import patch

behavioral/chaining_method.py renamed to patterns/behavioral/chaining_method.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from behavioral.publish_subscribe import Provider, Publisher, Subscriber
+from patterns.behavioral.publish_subscribe import Provider, Publisher, Subscriber
 
 try:
     from unittest.mock import patch, call

behavioral/command.py renamed to patterns/behavioral/command.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from behavioral.state import Radio
+from patterns.behavioral.state import Radio
 
 
 class RadioTest(unittest.TestCase):

behavioral/iterator.py renamed to patterns/behavioral/iterator.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from creational.abstract_factory import PetShop, Dog
+from patterns.creational.abstract_factory import PetShop, Dog
 
 try:
     from unittest.mock import patch

behavioral/mediator.py renamed to patterns/behavioral/mediator.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from creational.borg import Borg, YourBorg
+from patterns.creational.borg import Borg, YourBorg
 
 
 class BorgTest(unittest.TestCase):

behavioral/memento.py renamed to patterns/behavioral/memento.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from creational.builder import construct_building, House, Flat, ComplexHouse
+from patterns.creational.builder import construct_building, House, Flat, ComplexHouse
 
 
 class TestSimple(unittest.TestCase):

behavioral/observer.py renamed to patterns/behavioral/observer.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from creational.factory_method import get_localizer
+from patterns.creational.factory_method import get_localizer
 
 
 class TestLocalizer(unittest.TestCase):

behavioral/publish_subscribe.py renamed to patterns/behavioral/publish_subscribe.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 import unittest
-from creational.lazy_evaluation import Person
+from patterns.creational.lazy_evaluation import Person
 
 
 class TestDynamicExpanding(unittest.TestCase):

behavioral/registry.py renamed to patterns/behavioral/registry.py

@@ -6,7 +6,7 @@
     import queue
 except ImportError:  # python 2.x compatibility
     import Queue as queue
-from creational.pool import ObjectPool
+from patterns.creational.pool import ObjectPool
 
 
 class TestPool(unittest.TestCase):

behavioral/specification.py renamed to patterns/behavioral/specification.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from creational.prototype import Prototype, PrototypeDispatcher
+from patterns.creational.prototype import Prototype, PrototypeDispatcher
 
 
 class TestPrototypeFeatures(unittest.TestCase):

behavioral/state.py renamed to patterns/behavioral/state.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from dft.constructor_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
+from patterns.dft.constructor_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
 
 """
 Port of the Java example of "Constructor Injection" in

behavioral/strategy.py renamed to patterns/behavioral/strategy.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from dft.parameter_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
+from patterns.dft.parameter_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
 
 """
 Port of the Java example of "Parameter Injection" in

behavioral/template.py renamed to patterns/behavioral/template.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from dft.setter_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
+from patterns.dft.setter_injection import TimeDisplay, MidnightTimeProvider, ProductionCodeTimeProvider, datetime
 
 """
 Port of the Java example of "Setter Injection" in

behavioral/visitor.py renamed to patterns/behavioral/visitor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from structural.adapter import Dog, Cat, Human, Car, Adapter
+from patterns.structural.adapter import Dog, Cat, Human, Car, Adapter
 
 
 class ClassTest(unittest.TestCase):

behavioral/viz/catalog.py.png renamed to patterns/behavioral/viz/catalog.py.png

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
+from patterns.structural.bridge import DrawingAPI1, DrawingAPI2, CircleShape
 
 try:
     from unittest.mock import patch

behavioral/viz/chain.py.png renamed to patterns/behavioral/viz/chain.py.png

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from structural.decorator import TextTag, BoldWrapper, ItalicWrapper
+from patterns.structural.decorator import TextTag, BoldWrapper, ItalicWrapper
 
 
 class TestTextWrapping(unittest.TestCase):

behavioral/viz/chaining_method.py.png renamed to patterns/behavioral/viz/chaining_method.py.png

@@ -7,7 +7,7 @@
     from io import StringIO
 except ImportError:
     from StringIO import StringIO
-from structural.facade import TestRunner, TC1, TC2, TC3
+from patterns.structural.facade import TestRunner, TC1, TC2, TC3
 
 
 class TestRunnerFacilities(unittest.TestCase):

behavioral/viz/command.py.png renamed to patterns/behavioral/viz/command.py.png

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from structural.flyweight import Card
+from patterns.structural.flyweight import Card
 
 
 class TestCard(unittest.TestCase):

behavioral/viz/iterator.py.png renamed to patterns/behavioral/viz/iterator.py.png

@@ -3,7 +3,7 @@
 import sys
 from time import time
 import unittest
-from structural.proxy import Proxy, NoTalkProxy
+from patterns.structural.proxy import Proxy, NoTalkProxy
 
 if sys.version_info[0] == 2:
     from StringIO import StringIO

behavioral/viz/mediator.py.png renamed to patterns/behavioral/viz/mediator.py.png

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import unittest
-from other.hsm.hsm import (
+from patterns.other.hsm.hsm import (
     HierachicalStateMachine,
     UnsupportedMessageType,
     UnsupportedState,

behavioral/viz/memento.py.png renamed to patterns/behavioral/viz/memento.py.png

@@ -8,10 +8,10 @@
 
 import pytest
 
-from behavioral.visitor import main as visitor_main
-from behavioral.visitor import OUTPUT as visitor_output
-from behavioral.strategy import main as strategy_main
-from behavioral.strategy import OUTPUT as strategy_output
+from patterns.behavioral.visitor import main as visitor_main
+from patterns.behavioral.visitor import OUTPUT as visitor_output
+from patterns.behavioral.strategy import main as strategy_main
+from patterns.behavioral.strategy import OUTPUT as strategy_output
 
 @pytest.mark.skipif(sys.version_info < (3,4),
                     reason="requires python3.4 or higher")