Fix bugs in setuptools packaging
This commit is contained in:
		
							
								
								
									
										109
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										109
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,105 +1,6 @@ | |||||||
| # Byte-compiled / optimized / DLL files |  | ||||||
| __pycache__/ | __pycache__/ | ||||||
| *.py[cod] | .gitignore | ||||||
| *$py.class | .vscode/ | ||||||
|  | parsers/__pycache__/ | ||||||
| # C extensions | books/ | ||||||
| *.so | Examples/ | ||||||
|  |  | ||||||
| # Distribution / packaging |  | ||||||
| .Python |  | ||||||
| build/ |  | ||||||
| develop-eggs/ |  | ||||||
| dist/ |  | ||||||
| downloads/ |  | ||||||
| eggs/ |  | ||||||
| .eggs/ |  | ||||||
| lib/ |  | ||||||
| lib64/ |  | ||||||
| parts/ |  | ||||||
| sdist/ |  | ||||||
| var/ |  | ||||||
| wheels/ |  | ||||||
| *.egg-info/ |  | ||||||
| .installed.cfg |  | ||||||
| *.egg |  | ||||||
| MANIFEST |  | ||||||
|  |  | ||||||
| # PyInstaller |  | ||||||
| #  Usually these files are written by a python script from a template |  | ||||||
| #  before PyInstaller builds the exe, so as to inject date/other infos into it. |  | ||||||
| *.manifest |  | ||||||
| *.spec |  | ||||||
|  |  | ||||||
| # Installer logs |  | ||||||
| pip-log.txt |  | ||||||
| pip-delete-this-directory.txt |  | ||||||
|  |  | ||||||
| # Unit test / coverage reports |  | ||||||
| htmlcov/ |  | ||||||
| .tox/ |  | ||||||
| .coverage |  | ||||||
| .coverage.* |  | ||||||
| .cache |  | ||||||
| nosetests.xml |  | ||||||
| coverage.xml |  | ||||||
| *.cover |  | ||||||
| .hypothesis/ |  | ||||||
| .pytest_cache/ |  | ||||||
|  |  | ||||||
| # Translations |  | ||||||
| *.mo |  | ||||||
| *.pot |  | ||||||
|  |  | ||||||
| # Django stuff: |  | ||||||
| *.log |  | ||||||
| .static_storage/ |  | ||||||
| .media/ |  | ||||||
| local_settings.py |  | ||||||
|  |  | ||||||
| # Flask stuff: |  | ||||||
| instance/ |  | ||||||
| .webassets-cache |  | ||||||
|  |  | ||||||
| # Scrapy stuff: |  | ||||||
| .scrapy |  | ||||||
|  |  | ||||||
| # Sphinx documentation |  | ||||||
| docs/_build/ |  | ||||||
|  |  | ||||||
| # PyBuilder |  | ||||||
| target/ |  | ||||||
|  |  | ||||||
| # Jupyter Notebook |  | ||||||
| .ipynb_checkpoints |  | ||||||
|  |  | ||||||
| # pyenv |  | ||||||
| .python-version |  | ||||||
|  |  | ||||||
| # celery beat schedule file |  | ||||||
| celerybeat-schedule |  | ||||||
|  |  | ||||||
| # SageMath parsed files |  | ||||||
| *.sage.py |  | ||||||
|  |  | ||||||
| # Environments |  | ||||||
| .env |  | ||||||
| .venv |  | ||||||
| env/ |  | ||||||
| venv/ |  | ||||||
| ENV/ |  | ||||||
| env.bak/ |  | ||||||
| venv.bak/ |  | ||||||
|  |  | ||||||
| # Spyder project settings |  | ||||||
| .spyderproject |  | ||||||
| .spyproject |  | ||||||
|  |  | ||||||
| # Rope project settings |  | ||||||
| .ropeproject |  | ||||||
|  |  | ||||||
| # mkdocs documentation |  | ||||||
| /site |  | ||||||
|  |  | ||||||
| # mypy |  | ||||||
| .mypy_cache/ |  | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ from lector.settingsdialog import SettingsUI | |||||||
| from lector.metadatadialog import MetadataUI | from lector.metadatadialog import MetadataUI | ||||||
| from lector.definitionsdialog import DefinitionsUI | from lector.definitionsdialog import DefinitionsUI | ||||||
|  |  | ||||||
| from resources import mainwindow | from resources import mainwindow, resources | ||||||
|  |  | ||||||
|  |  | ||||||
| class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow): | class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow): | ||||||
|   | |||||||
| @@ -42,7 +42,9 @@ class SettingsUI(QtWidgets.QDialog, settingswindow.Ui_Dialog): | |||||||
|         self.move(self.parent.settings['settings_dialog_position']) |         self.move(self.parent.settings['settings_dialog_position']) | ||||||
|  |  | ||||||
|         self.aboutBox.setVisible(False) |         self.aboutBox.setVisible(False) | ||||||
|         aboutfile_path = os.path.join('resources', 'about.html') |         application_root = os.sep.join( | ||||||
|  |             os.path.realpath(__file__).rsplit('/')[:-2]) | ||||||
|  |         aboutfile_path = os.path.join(application_root, 'resources', 'about.html') | ||||||
|         with open(aboutfile_path) as about_html: |         with open(aboutfile_path) as about_html: | ||||||
|             self.aboutBox.setHtml(about_html.read()) |             self.aboutBox.setHtml(about_html.read()) | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										24
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								setup.py
									
									
									
									
									
								
							| @@ -8,9 +8,9 @@ HERE = path.abspath(path.dirname(__file__)) | |||||||
| with codecs.open(path.join(HERE, 'README.md'), encoding='utf-8') as f: | with codecs.open(path.join(HERE, 'README.md'), encoding='utf-8') as f: | ||||||
|     LONG_DESC = f.read() |     LONG_DESC = f.read() | ||||||
|  |  | ||||||
| INSTALL_DEPS = ['PyQt5==5.10.1', | INSTALL_DEPS = ['PyQt5>=5.10.1', | ||||||
|                 'requests==2.18.4', |                 'requests>=2.18.4', | ||||||
|                 'beautifulsoup4==4.6.0'] |                 'beautifulsoup4>=4.6.0'] | ||||||
| TEST_DEPS = ['pytest', | TEST_DEPS = ['pytest', | ||||||
|              'unittest2'] |              'unittest2'] | ||||||
| DEV_DEPS = [] | DEV_DEPS = [] | ||||||
| @@ -38,26 +38,19 @@ setup( | |||||||
|         #   4 - Beta |         #   4 - Beta | ||||||
|         #   5 - Production/Stable |         #   5 - Production/Stable | ||||||
|         'Development Status :: 3 - Alpha', |         'Development Status :: 3 - Alpha', | ||||||
|  |  | ||||||
|         'Intended Audience :: End Users/Desktop', |         'Intended Audience :: End Users/Desktop', | ||||||
|  |  | ||||||
|         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', |         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', | ||||||
|  |  | ||||||
|         'Programming Language :: Python :: 3', |  | ||||||
|         'Programming Language :: Python :: 3.4', |  | ||||||
|         'Programming Language :: Python :: 3.5', |  | ||||||
|         'Programming Language :: Python :: 3.6', |         'Programming Language :: Python :: 3.6', | ||||||
|     ], |     ], | ||||||
|  |  | ||||||
|     # What does your project relate to? |     # What does your project relate to? | ||||||
|     keywords='qt ebook epub kindle', |     keywords='qt ebook epub kindle mobi', | ||||||
|  |  | ||||||
|     packages=find_packages(), |     packages=find_packages(), | ||||||
|  |  | ||||||
|     entry_points={ |     entry_points={ | ||||||
|           'console_scripts': [ |         'gui_scripts': [ | ||||||
|               'lector = lector.__main__:main' |             'lector = lector.__main__:main'] | ||||||
|           ] |  | ||||||
|     }, |     }, | ||||||
|     # List run-time dependencies here.  These will be installed by pip when |     # List run-time dependencies here.  These will be installed by pip when | ||||||
|     # your project is installed. For an analysis of "install_requires" vs pip's |     # your project is installed. For an analysis of "install_requires" vs pip's | ||||||
| @@ -67,7 +60,10 @@ setup( | |||||||
|  |  | ||||||
|     setup_requires=['setuptools_scm'], |     setup_requires=['setuptools_scm'], | ||||||
|  |  | ||||||
|     python_requires='>=3.4, <4.0', |     python_requires='>=3.6, <4.0', | ||||||
|  |  | ||||||
|  |     package_data={'lector': ['about.html', '*.png', '*.svg', '*.qrc']}, | ||||||
|  |     include_package_data=True, | ||||||
|  |  | ||||||
|     # List additional groups of dependencies here (e.g. development |     # List additional groups of dependencies here (e.g. development | ||||||
|     # dependencies). You can install these using the following syntax, |     # dependencies). You can install these using the following syntax, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user