jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904164 )
Change subject: [IMPR] Remove -nodist option for make_dist.py
......................................................................
[IMPR] Remove -nodist option for make_dist.py
- always delete previous distribution with -local or -remote option.
This acts like the previous -clear -remote|-local option combination
- do not create a distribution with -clear option. This acts like
the previous -clear -nodist option combination
Change-Id: I93cf1c87fa18d59348ff7f5f954aa94349f0ded7
---
M make_dist.py
M tests/make_dist_tests.py
2 files changed, 36 insertions(+), 32 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make_dist.py b/make_dist.py
index 0d354b4..45d64b7 100755
--- a/make_dist.py
+++ b/make_dist.py
@@ -7,17 +7,17 @@
-local Install the distribution as a local site-package. If a
Pywikibot package is already there, it will be uninstalled
- first.
+ first. Clears old dist folders first.
-remote Upload the package to pypi. This cannot be done if the
- Pywikibot version is a development release.
+ Pywikibot version is a development release. Clears old dist
+ folders first.
--clear Clear old dist folders
+-clear Clear old dist folders and leave. Does not create a
+ distribution.
--upgrade Upgrade distribution packages pip, setuptools, wheel and twine
- first
-
--nodist Do not create a distribution. Useful to -clear or -upgrade only.
+-upgrade Upgrade distribution packages pip, setuptools, wheel and
+ twine first
Usage::
@@ -29,12 +29,17 @@
- updates pip, setuptools, wheel and twine packages first
- installs pre-releases over stable versions
- also creates built distribution together with source distribution
- - `-upgrade` option was added
+ - *-upgrade* option was added
.. versionchanged:: 7.5
- - `clear` option was added
- - `nodist` option was added
+ - *clear* option was added
+ - *nodist* option was added
+
+.. versionchanged:: 8.1
+ *nodist* option was removed, *clear* option does not create a
+ distribution. *local* and *remote* option clears old distributions
+ first.
"""
#
# (C) Pywikibot team, 2022-2023
@@ -59,13 +64,12 @@
.. versionadded:: 8.0
"""
- def __init__(self, local, remote, clear, upgrade, nodist) -> None:
+ def __init__(self, local, remote, clear, upgrade) -> None:
"""Initializer."""
self.local = local
self.remote = remote
self.clear = clear
self.upgrade = upgrade
- self.nodist = nodist
self.folder = Path().resolve()
def clear_old_dist(self) -> None: # pragma: no cover
@@ -94,11 +98,10 @@
check_call(
'pip install --upgrade setuptools wheel twine ', shell=True)
- if self.clear:
+ if self.local or self.remote or self.clear:
self.clear_old_dist()
-
- if self.nodist:
- return
+ if self.clear:
+ return
self.copy_files()
try:
@@ -181,17 +184,13 @@
remote = '-remote' in sys.argv
clear = '-clear' in sys.argv
upgrade = '-upgrade' in sys.argv
- nodist = '-nodist' in sys.argv
-
- if nodist:
- local, remote = False, False
if remote and 'dev' in __version__:
warning('Distribution must not be a developmental release to upload.')
remote = False
sys.argv = [sys.argv[0], 'sdist', 'bdist_wheel']
- return local, remote, clear, upgrade, nodist
+ return local, remote, clear, upgrade
def main() -> None: # pragma: no cover
diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py
index 098a8fb..264e634 100755
--- a/tests/make_dist_tests.py
+++ b/tests/make_dist_tests.py
@@ -30,26 +30,17 @@
def test_handle_args_empty(self):
"""Test make_dist handle_args function."""
args = handle_args()
- self.assertEqual(args, (False, ) * 5)
- self._test_argv()
-
- def test_handle_args_nodist(self):
- """Test make_dist handle_args function."""
- sys.argv += ['-local', '-nodist', '-remote']
- *args, nodist = handle_args()
- self.assertEqual(args, [False] * 4)
- self.assertTrue(nodist)
+ self.assertEqual(args, (False, ) * 4)
self._test_argv()
def test_handle_args(self):
"""Test make_dist handle_args function."""
sys.argv += ['-clear', '-local', '-remote', '-upgrade']
- local, remote, clear, upgrade, nodist = handle_args()
+ local, remote, clear, upgrade = handle_args()
self.assertTrue(local)
self.assertEqual(remote, 'dev' not in __version__)
self.assertTrue(clear)
self.assertTrue(upgrade)
- self.assertFalse(nodist)
self._test_argv()
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/904164
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I93cf1c87fa18d59348ff7f5f954aa94349f0ded7
Gerrit-Change-Number: 904164
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
