diff --git a/Makefile b/Makefile index 6cc53b5..5891194 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ install-setup:: install-pip:: # we install --nodeps because pip is installing stuff we already have in the OS ${PIP_EXE_MSYS} --python ${PYTHON_EXE_MSYS} install \ - --no-deps --no-index \ + --no-deps \ --target ${PREFIX}/lib/python${PYTHON_MINOR}/site-packages/ \ --upgrade . diff --git a/pyproject.toml b/pyproject.toml index 197811b..b5357ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,9 +28,6 @@ classifiers = [ ] dynamic = ["version", "readme", "dependencies"] # cannot be dynamic ['license'] -[project.scripts] -qweechat = "qweechat:iMain" - [project.license] file = "COPYING" @@ -48,6 +45,8 @@ version = {attr = "qweechat.version.VERSION"} readme = {file = ["README.md"]} dependencies = {file = ["requirements.txt"]} -[tool.setuptools] -packages = ["qweechat", "qweechat.weechat"] +#[tool.setuptools] +#packages = ["qweechat", "qweechat.weechat"] +#[tool.setuptools.packages.find] +#where=src diff --git a/setup.cfg b/setup.cfg index 71b9a89..c8d6ca6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,21 +17,24 @@ classifiers = [options] zip_safe = false -python_requires = ~=3.7 +python_requires = >= 3.7 package_dir= - =. -packages=find: + =src + # find: +packages = + qweechat + qweechat.weechat [options.package_data] qweechat = data/icons/*.png [options.entry_points] -console_scripts = +gui_scripts = qweechat = "qweechat:iMain" #[options.packages.find] -#where=. +#xwhere=src [easy_install] zip_ok = false diff --git a/setup.py.dst b/setup.py.dst index 9224aca..8c51dd3 100644 --- a/setup.py.dst +++ b/setup.py.dst @@ -44,12 +44,12 @@ setup( 'Programming Language :: Python', 'Topic :: Communications :: Chat', ], - packages=['qweechat', 'qweechat.weechat'], + packages=['qweechat', 'qweechat.weechat', 'qweechat.data.icons'], include_package_data=True, package_data={'qweechat': ['data/icons/*.png']}, entry_points={ 'gui_scripts': [ - 'qweechat = qweechat.qweechat:main', + 'qweechat = qweechat.qweechat:iMain', ], 'console_scripts': [ 'qweechat-testproto = qweechat.weechat.testproto:main', @@ -57,6 +57,7 @@ setup( }, install_requires=[ 'PyQt5', + 'qtconsole', ], zip_safe = False, ) diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/qweechat/__init__.py b/src/qweechat/__init__.py similarity index 100% rename from qweechat/__init__.py rename to src/qweechat/__init__.py diff --git a/qweechat/__main__.py b/src/qweechat/__main__.py similarity index 100% rename from qweechat/__main__.py rename to src/qweechat/__main__.py diff --git a/qweechat/about.py b/src/qweechat/about.py similarity index 100% rename from qweechat/about.py rename to src/qweechat/about.py diff --git a/qweechat/buffer.py b/src/qweechat/buffer.py similarity index 100% rename from qweechat/buffer.py rename to src/qweechat/buffer.py diff --git a/qweechat/chat.py b/src/qweechat/chat.py similarity index 100% rename from qweechat/chat.py rename to src/qweechat/chat.py diff --git a/qweechat/config.py b/src/qweechat/config.py similarity index 100% rename from qweechat/config.py rename to src/qweechat/config.py diff --git a/qweechat/connection.py b/src/qweechat/connection.py similarity index 100% rename from qweechat/connection.py rename to src/qweechat/connection.py diff --git a/qweechat/data/icons/README b/src/qweechat/data/icons/README similarity index 100% rename from qweechat/data/icons/README rename to src/qweechat/data/icons/README diff --git a/qweechat/data/icons/application-exit.png b/src/qweechat/data/icons/application-exit.png similarity index 100% rename from qweechat/data/icons/application-exit.png rename to src/qweechat/data/icons/application-exit.png diff --git a/qweechat/data/icons/bullet_green_8x8.png b/src/qweechat/data/icons/bullet_green_8x8.png similarity index 100% rename from qweechat/data/icons/bullet_green_8x8.png rename to src/qweechat/data/icons/bullet_green_8x8.png diff --git a/qweechat/data/icons/bullet_yellow_8x8.png b/src/qweechat/data/icons/bullet_yellow_8x8.png similarity index 100% rename from qweechat/data/icons/bullet_yellow_8x8.png rename to src/qweechat/data/icons/bullet_yellow_8x8.png diff --git a/qweechat/data/icons/dialog-close.png b/src/qweechat/data/icons/dialog-close.png similarity index 100% rename from qweechat/data/icons/dialog-close.png rename to src/qweechat/data/icons/dialog-close.png diff --git a/qweechat/data/icons/dialog-ok-apply.png b/src/qweechat/data/icons/dialog-ok-apply.png similarity index 100% rename from qweechat/data/icons/dialog-ok-apply.png rename to src/qweechat/data/icons/dialog-ok-apply.png diff --git a/qweechat/data/icons/dialog-password.png b/src/qweechat/data/icons/dialog-password.png similarity index 100% rename from qweechat/data/icons/dialog-password.png rename to src/qweechat/data/icons/dialog-password.png diff --git a/qweechat/data/icons/dialog-warning.png b/src/qweechat/data/icons/dialog-warning.png similarity index 100% rename from qweechat/data/icons/dialog-warning.png rename to src/qweechat/data/icons/dialog-warning.png diff --git a/qweechat/data/icons/document-save.png b/src/qweechat/data/icons/document-save.png similarity index 100% rename from qweechat/data/icons/document-save.png rename to src/qweechat/data/icons/document-save.png diff --git a/qweechat/data/icons/edit-find.png b/src/qweechat/data/icons/edit-find.png similarity index 100% rename from qweechat/data/icons/edit-find.png rename to src/qweechat/data/icons/edit-find.png diff --git a/qweechat/data/icons/help-about.png b/src/qweechat/data/icons/help-about.png similarity index 100% rename from qweechat/data/icons/help-about.png rename to src/qweechat/data/icons/help-about.png diff --git a/qweechat/data/icons/network-connect.png b/src/qweechat/data/icons/network-connect.png similarity index 100% rename from qweechat/data/icons/network-connect.png rename to src/qweechat/data/icons/network-connect.png diff --git a/qweechat/data/icons/network-disconnect.png b/src/qweechat/data/icons/network-disconnect.png similarity index 100% rename from qweechat/data/icons/network-disconnect.png rename to src/qweechat/data/icons/network-disconnect.png diff --git a/qweechat/data/icons/preferences-other.png b/src/qweechat/data/icons/preferences-other.png similarity index 100% rename from qweechat/data/icons/preferences-other.png rename to src/qweechat/data/icons/preferences-other.png diff --git a/qweechat/data/icons/weechat.png b/src/qweechat/data/icons/weechat.png similarity index 100% rename from qweechat/data/icons/weechat.png rename to src/qweechat/data/icons/weechat.png diff --git a/qweechat/debug.py b/src/qweechat/debug.py similarity index 100% rename from qweechat/debug.py rename to src/qweechat/debug.py diff --git a/qweechat/input.py b/src/qweechat/input.py similarity index 100% rename from qweechat/input.py rename to src/qweechat/input.py diff --git a/qweechat/network.py b/src/qweechat/network.py similarity index 100% rename from qweechat/network.py rename to src/qweechat/network.py diff --git a/qweechat/preferences.py b/src/qweechat/preferences.py similarity index 100% rename from qweechat/preferences.py rename to src/qweechat/preferences.py diff --git a/qweechat/preferences.py.new b/src/qweechat/preferences.py.new similarity index 100% rename from qweechat/preferences.py.new rename to src/qweechat/preferences.py.new diff --git a/qweechat/qweechat.py b/src/qweechat/qweechat.py similarity index 100% rename from qweechat/qweechat.py rename to src/qweechat/qweechat.py diff --git a/qweechat/version.py b/src/qweechat/version.py similarity index 100% rename from qweechat/version.py rename to src/qweechat/version.py diff --git a/qweechat/weechat/__init__.py b/src/qweechat/weechat/__init__.py similarity index 100% rename from qweechat/weechat/__init__.py rename to src/qweechat/weechat/__init__.py diff --git a/qweechat/weechat/color.py b/src/qweechat/weechat/color.py similarity index 100% rename from qweechat/weechat/color.py rename to src/qweechat/weechat/color.py diff --git a/qweechat/weechat/protocol.py b/src/qweechat/weechat/protocol.py similarity index 100% rename from qweechat/weechat/protocol.py rename to src/qweechat/weechat/protocol.py diff --git a/qweechat/weechat/testproto.py b/src/qweechat/weechat/testproto.py similarity index 100% rename from qweechat/weechat/testproto.py rename to src/qweechat/weechat/testproto.py