diff options
author | Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com> | 2017-07-13 13:53:10 +0200 |
---|---|---|
committer | Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com> | 2017-07-13 13:53:10 +0200 |
commit | cc6169ac2238cf32fe120790c9fb639bfa2d4c96 (patch) | |
tree | b7f8c9bfb1a0dd410c4a2120762212bcf9b3b080 | |
parent | 62185cb8d52bba55a2e3eeb0da2a7597fffb0e1b (diff) | |
download | qtivi-qface-cc6169ac2238cf32fe120790c9fb639bfa2d4c96.tar.gz |
Fixed some smaller issues with named filters and how the
setup tools are working
-rwxr-xr-x | cli.py | 19 | ||||
-rw-r--r-- | qface/__about__.py | 2 | ||||
-rw-r--r-- | qface/helper/qtcpp.py | 7 | ||||
-rw-r--r-- | setup.py | 3 |
4 files changed, 20 insertions, 11 deletions
@@ -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..2e0bc50 100644 --- a/qface/__about__.py +++ b/qface/__about__.py @@ -8,7 +8,7 @@ except NameError: __title__ = "qface" __summary__ = "A generator framework based on a common modern IDL" -__uri__ = "https://pelagicore.github.io/qface/" +__url__ = "https://pelagicore.github.io/qface/" __version__ = "1.3.1" __author__ = "JRyannel" __author_email__ = "qface-generator@googlegroups.com" 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): @@ -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', |