Skip to content

Commit

Permalink
fix packaging for pip
Browse files Browse the repository at this point in the history
  • Loading branch information
phfaist committed May 3, 2018
1 parent 5c6f821 commit cbe0623
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ include doc/*.py
include doc/*.png
include doc/Makefile
include doc/make.bat
include pip_requirements.txt
recursive-include doc/_static *
recursive-include doc/_templates *
8 changes: 4 additions & 4 deletions gui/bibolamazi_gui/bibolamazi_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
from bibolamazi.core import blogger

from bibolamazi.core import bibolamazifile
from bibolamazi.core import main
#from bibolamazi.core import main as bibolamazi_main
from bibolamazi.core.butils import BibolamaziError
from bibolamazi.core.bibfilter import factory as filters_factory
from bibolamazi.core.bibfilter import argtypes
Expand Down Expand Up @@ -80,7 +80,7 @@ def setup_qt5_plugins_path():



def run_main():
def main():

blogger.setup_simple_console_logging(level=logging.DEBUG)

Expand All @@ -99,7 +99,7 @@ def run_main():
else:
logging.getLogger().setLevel(log_level)

logger.debug("run_main: log level set to %r", log_level)
logger.debug("main: log level set to %r", log_level)


# setup Qt paths!
Expand All @@ -125,4 +125,4 @@ def run_main():

if __name__ == '__main__':

run_main()
main()
6 changes: 5 additions & 1 deletion gui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@

packages = ['bibolamazi_gui', 'bibolamazi_gui.qtauto'],
zip_safe = True,
scripts = ['bin/bibolamazi_gui'],
#scripts = ['bin/bibolamazi_gui'],
entry_points = {
'console_scripts': ['bibolamazi_gui=bibolamazi_gui.bibolamazi_gui:main'],
},


# make sure we have the same bibolamazi version. Since the GUI uses (some internals?)
# of the bibolamazi library, make sure we have the same version.
Expand Down
9 changes: 7 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def _parse_requires(fn):
sys.stderr.write("(Requirements: %s)\n\n\n" % (install_requires))


packages = find_packages(include=['bibolamazi.*'], exclude=['bibolamazi_gui', 'bibolamazi_gui.*'])
packages = find_packages(include=['bibolamazi', 'bibolamazi.*'],
exclude=['bibolamazi_gui', 'bibolamazi_gui.*'])
#print("packages = %r"%packages)

setup(
Expand Down Expand Up @@ -69,7 +70,11 @@ def _parse_requires(fn):

packages = packages,
zip_safe = True,
scripts = ['bin/bibolamazi'],

#scripts = ['bin/bibolamazi'],
entry_points = {
'console_scripts': ['bibolamazi=bibolamazi.core.main:main'],
},

install_requires = install_requires,

Expand Down

0 comments on commit cbe0623

Please sign in to comment.