Merge branch 'release/1.4'1.4

7 files changed, 25 insertions, 12 deletions

diff --git a/README.md b/README.md
index d0eb57e..6da4a4a 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ QFace is written out of the learnings of using IDLs in other large projects. Oft
 
 Please see the INSTALL and USAGE guides for more information.
 
+## Documentation
+
+Documentation is hosted at [readthedocs](http://qface.readthedocs.io/en/latest/).
+
 ## Install
 
 To install the qface library you need to have python3 and pip installed.
diff --git a/cli.py b/cli.py
index 09863a2..39ca71a 100755
--- a/cli.py
+++ b/cli.py
@@ -14,13 +14,13 @@ import logging.config
 from livereload import Server, shell
 
 
-here = os.path.dirname(__file__)
+here = Path(__file__).abspath().dirname()
 
-logging.config.dictConfig(yaml.load(open(os.path.join(here, 'log.yaml'))))
+logging.config.dictConfig(yaml.load((here / 'log.yaml').open()))
 logger = logging.getLogger(__name__)
 
 
-os.environ['PYTHONPATH'] = os.getcwd()
+os.environ['PYTHONPATH'] = Path.getcwd()
 
 
 def sh(cmd, all=False, **kwargs):
@@ -167,16 +167,19 @@ def uninstall():
 
 @cli.command()
 def upload():
-    Path('build').rmtree_p()
-    dist = Path('dist')
-    dist.rmtree_p()
-    dist.makedirs_p()
-    sh('python3 setup.py bdist_wheel')
     sh('twine upload dist/*')
     Path('build').rmtree_p()
 
 
 @cli.command()
+def pack():
+    Path('build').rmtree_p()
+    Path('dist').rmtree_p()
+    sh('python3 setup.py bdist_wheel')
+    sh('unzip -l dist/*.whl')
+
+
+@cli.command()
 def docs_serve():
     server = Server()
     server.watch('docs/*.rst', shell('make html', cwd='docs'))
diff --git a/qface/__about__.py b/qface/__about__.py
index 62e9bb7..3252263 100644
--- a/qface/__about__.py
+++ b/qface/__about__.py
@@ -8,8 +8,8 @@ except NameError:
 
 __title__ = "qface"
 __summary__ = "A generator framework based on a common modern IDL"
-__uri__ = "https://pelagicore.github.io/qface/"
-__version__ = "1.3.1"
+__url__ = "https://pelagicore.github.io/qface/"
+__version__ = "1.4"
 __author__ = "JRyannel"
 __author_email__ = "qface-generator@googlegroups.com"
 __copyright__ = "2017 Pelagicore"
diff --git a/qface/helper/qtcpp.py b/qface/helper/qtcpp.py
index 97a5d44..8310c4b 100644
--- a/qface/helper/qtcpp.py
+++ b/qface/helper/qtcpp.py
@@ -134,7 +134,7 @@ class Filters(object):
     def parameters(env, s, filter=None, spaces=True):
         if not filter:
             filter = Filters.parameterType
-        else:
+        elif isinstance(filter, str):
             filter = env.filters[filter]
         args = []
         indent = ', '
@@ -151,9 +151,12 @@ class Filters(object):
         return indent.join([filter(a) for a in args])
 
     @staticmethod
-    def signature(s, expand=False, filter=None):
+    @environmentfilter
+    def signature(env, s, expand=False, filter=None):
         if not filter:
             filter = Filters.returnType
+        elif isinstance(filter, str):
+            filter = env.filters[filter]
         if isinstance(s, domain.Operation):
             args = s.parameters
         elif isinstance(s, domain.Signal):
diff --git a/qface/templates/__init__.py b/qface/templates/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/qface/templates/__init__.py
diff --git a/qface/templates/qface/__init__.py b/qface/templates/qface/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/qface/templates/qface/__init__.py
diff --git a/setup.py b/setup.py
index 567f9e2..e37e3e6 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,9 @@ setup(
     keywords='qt code generator framework',
     packages=find_packages(),
     include_package_data=True,
+    package_data={
+        '': ['*[!*.pyc]']
+    },
     install_requires=[
         'jinja2',
         'path.py',