Merge pull request #39 from rht/contracts

Reorg contracts
AB-CE · Jun 19, 2017 · 6516391 · 6516391
2 parents 83cfbe7 + 6f72861
commit 6516391
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1 deletion.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,6 @@
 include README.rst
 include template/*
+include abce/contracts/*
 include unittest/*
 include abce/agents/*
 recursive-include example *

diff --git a/abce/__init__.py b/abce/__init__.py
@@ -62,7 +62,7 @@
 from abce.agents import (FirmMultiTechnologies, ProductionFunction, Firm, Household,
                          Utility_Function, SilentDeadAgent, LoudDeadAgent)
 from .quote import Quote
-from .contracting import Contracting
+from abce.contracts import Contracting
 import json
 from . import abcegui
 from .processorgroup import ProcessorGroup

diff --git a/abce/contracts/__init__.py b/abce/contracts/__init__.py
@@ -0,0 +1 @@
+from .contracting import Contracting
diff --git a/abce/contracting.py → abce/contracts/contracting.py b/abce/contracting.py → abce/contracts/contracting.py
diff --git a/abce/flexiblecontracting.py → abce/contracts/flexiblecontracting.py b/abce/flexiblecontracting.py → abce/contracts/flexiblecontracting.py