Merge pull request 'Fix dont-use-st-markdown.patch (don't list packages explicitly,' (#2) from mcepl_pkgs/git-deps:fix_setup-cfg into factory
This commit is contained in:
commit
73f7bfc8d4
@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
setup.cfg | 6 ++++--
|
setup.cfg | 8 +++++---
|
||||||
setup.py | 25 +------------------------
|
setup.py | 25 +------------------------
|
||||||
tests/create-repo.sh | 1 -
|
tests/create-repo.sh | 1 -
|
||||||
3 files changed, 5 insertions(+), 27 deletions(-)
|
3 files changed, 6 insertions(+), 28 deletions(-)
|
||||||
|
|
||||||
--- a/setup.cfg
|
--- a/setup.cfg
|
||||||
+++ b/setup.cfg
|
+++ b/setup.cfg
|
||||||
@ -21,12 +21,14 @@
|
|||||||
classifier =
|
classifier =
|
||||||
Development Status :: 4 - Beta
|
Development Status :: 4 - Beta
|
||||||
Environment :: Console
|
Environment :: Console
|
||||||
@@ -33,6 +35,7 @@ data_files =
|
@@ -32,7 +34,8 @@ data_files =
|
||||||
|
|
||||||
[options]
|
[options]
|
||||||
packages =
|
packages =
|
||||||
git_deps
|
- git_deps
|
||||||
|
+ find:
|
||||||
+requires = Sphinx
|
+requires = Sphinx
|
||||||
|
|
||||||
[options.entry_points]
|
[options.entry_points]
|
||||||
console_scripts =
|
console_scripts =
|
||||||
@@ -48,7 +51,6 @@ addopts = tests
|
@@ -48,7 +51,6 @@ addopts = tests
|
||||||
@ -35,7 +37,7 @@
|
|||||||
addopts =
|
addopts =
|
||||||
- --cov git_deps --cov-report term-missing
|
- --cov git_deps --cov-report term-missing
|
||||||
--verbose
|
--verbose
|
||||||
|
|
||||||
[aliases]
|
[aliases]
|
||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/setup.py
|
+++ b/setup.py
|
||||||
@ -52,8 +54,8 @@
|
|||||||
-
|
-
|
||||||
-import sys
|
-import sys
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
|
|
||||||
-def setup_package():
|
-def setup_package():
|
||||||
- needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
|
- needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
|
||||||
- sphinx = ['sphinx'] if needs_sphinx else []
|
- sphinx = ['sphinx'] if needs_sphinx else []
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 29 22:36:44 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
- Fix dont-use-st-markdown.patch (don't list packages explicitly,
|
||||||
|
generate the list)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 18 14:49:09 UTC 2024 - mcepl@cepl.eu
|
Thu Jul 18 14:49:09 UTC 2024 - mcepl@cepl.eu
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user