diff options
author | Benjamin Balder Bach <benjamin@overtag.dk> | 2022-08-28 00:15:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-28 00:15:28 +0300 |
commit | 70927bf7cfe745ef680728a80fe8da62ed73a46c (patch) | |
tree | cc47391ece972da3e17f2b3bf3bc5605a0f2f7bc | |
parent | 695a4e164ca5e6cbf4182b12c5e879e325757d89 (diff) |
Fixup a wrong merge conflict resolution from #1321 (#1335)
* Fixup a wrong merge conflict resolution from #1321
* Add python_requires again to setup.cfg
-rw-r--r-- | setup.cfg | 1 | ||||
-rw-r--r-- | setup.py | 56 |
2 files changed, 1 insertions, 56 deletions
@@ -32,6 +32,7 @@ classifiers = include_package_data = True zip_safe = False packages = sphinx_rtd_theme +python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.* install_requires = sphinx >=1.6,<6 docutils <0.18 @@ -93,60 +93,4 @@ setup( 'build_assets': WebpackBuildCommand, 'watch': WebpackDevelopCommand, }, - zip_safe=False, - packages=['sphinx_rtd_theme'], - package_data={'sphinx_rtd_theme': [ - 'theme.conf', - '*.html', - 'static/css/*.css', - 'static/css/fonts/*.*', - 'static/js/*.js', - ]}, - include_package_data=True, - # See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package - entry_points = { - 'sphinx.html_themes': [ - 'sphinx_rtd_theme = sphinx_rtd_theme', - ] - }, - python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', - install_requires=[ - 'sphinx>=1.6', - 'docutils<0.18', - 'Jinja2<3.1', - ], - tests_require=[ - 'pytest', - ], - extras_require={ - 'dev': [ - 'transifex-client', - 'sphinxcontrib-httpdomain', - 'bump2version', - 'wheel', - ], - }, - classifiers=[ - 'Framework :: Sphinx', - 'Framework :: Sphinx :: Theme', - 'Development Status :: 5 - Production/Stable', - 'License :: OSI Approved :: MIT License', - 'Environment :: Console', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Operating System :: OS Independent', - 'Topic :: Documentation', - 'Topic :: Software Development :: Documentation', - ], - project_urls={ - 'Homepage': 'https://sphinx-rtd-theme.readthedocs.io/', - 'Source Code': 'https://github.com/readthedocs/sphinx_rtd_theme', - 'Issue Tracker': 'https://github.com/readthedocs/sphinx_rtd_theme/issues', - }, ) |