diff --git a/.tito/packages/dist-git-client b/.tito/packages/dist-git-client new file mode 100644 index 000000000..0a5ba7918 --- /dev/null +++ b/.tito/packages/dist-git-client @@ -0,0 +1 @@ +1.1-0 dist-git-client/ diff --git a/dist-git-client/LICENSE b/dist-git-client/LICENSE new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/dist-git-client/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/rpmbuild/bin/copr-distgit-client b/dist-git-client/bin/dist-git-client similarity index 69% rename from rpmbuild/bin/copr-distgit-client rename to dist-git-client/bin/dist-git-client index 0a49540b8..2b9f0ab06 100755 --- a/rpmbuild/bin/copr-distgit-client +++ b/dist-git-client/bin/dist-git-client @@ -1,10 +1,10 @@ -#! /usr/bin/python +#! /usr/bin/python3 """ From within a git checkout, try to download files from dist-git lookaside cache. """ -from copr_distgit_client import main +from dist_git_client import main if __name__ == "__main__": main() diff --git a/rpmbuild/copr-distgit-client b/dist-git-client/dist-git-client similarity index 95% rename from rpmbuild/copr-distgit-client rename to dist-git-client/dist-git-client index 6b3df2b28..f507e4206 100755 --- a/rpmbuild/copr-distgit-client +++ b/dist-git-client/dist-git-client @@ -19,4 +19,4 @@ absdir="$(dirname "$(readlink -f "$0")")" export PYTHONPATH="$absdir${PYTHONPATH+:$PYTHONPATH}" -python3 "$absdir/bin/copr-distgit-client" "$@" +python3 "$absdir/bin/dist-git-client" "$@" diff --git a/dist-git-client/dist-git-client.spec b/dist-git-client/dist-git-client.spec new file mode 100644 index 000000000..657bdce26 --- /dev/null +++ b/dist-git-client/dist-git-client.spec @@ -0,0 +1,81 @@ +# SPEC file overview: +# https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/#con_rpm-spec-file-overview +# Fedora packaging guidelines: +# https://docs.fedoraproject.org/en-US/packaging-guidelines/ + + +Name: dist-git-client +Version: 1.1 +Release: 0%{?dist} +Summary: Get sources for RPM builds from DistGit repositories +BuildArch: noarch + +License: GPL-2.0-or-later +URL: https://github.com/release-engineering/dist-git.git +Source0: %name-%version.tar.gz + +Requires: curl +Requires: /usr/bin/git + +BuildRequires: python3-pytest +BuildRequires: python3-rpm-macros +BuildRequires: python3-six +BuildRequires: /usr/bin/argparse-manpage +BuildRequires: /usr/bin/git + +%if 0%{?fedora} || 0%{?rhel} > 9 +Requires: python3-rpmautospec +BuildRequires: python3-rpmautospec +%endif + +%description +A simple, configurable python utility that is able to clone package sources from +a DistGit repository, download sources from the corresponding lookaside cache +locations, and generate source RPMs. + +The utility is able to automatically map the .git/config clone URL into the +corresponding DistGit instance configuration. + + +%prep +%setup -q + + +%build + + + +%install +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_mandir}/man1 +install -d %{buildroot}%{_sysconfdir}/dist-git-client +install -d %{buildroot}%{python3_sitelib} +install -p -m 755 bin/dist-git-client %buildroot%_bindir +argparse-manpage --pyfile dist_git_client.py \ + --function _get_argparser \ + --author "Copr Team" \ + --author-email "copr-team@redhat.com" \ + --url %url --project-name Copr \ +> %{buildroot}%{_mandir}/man1/dist-git-client.1 +install -p -m 644 etc/default.ini \ + %{buildroot}%{_sysconfdir}/dist-git-client +install -p -m 644 dist_git_client.py %{buildroot}%{python3_sitelib} + + +%check +PYTHON=python3 ./run_tests.sh -vv --no-coverage + + +%files +%license LICENSE +%_bindir/dist-git-client +%_mandir/man1/dist-git-client.1* +%dir %_sysconfdir/dist-git-client +%config %_sysconfdir/dist-git-client/default.ini +%python3_sitelib/dist_git_client.* +%python3_sitelib/__pycache__/dist_git_client* + + +%changelog +* Thu Jun 06 2024 Pavel Raiskup 1.1-0 +- new package built with tito diff --git a/rpmbuild/copr_distgit_client.py b/dist-git-client/dist_git_client.py similarity index 93% rename from rpmbuild/copr_distgit_client.py rename to dist-git-client/dist_git_client.py index ec891298d..d292a16cd 100644 --- a/rpmbuild/copr_distgit_client.py +++ b/dist-git-client/dist_git_client.py @@ -1,5 +1,5 @@ """ -copr-distgit-client code, moved to module to simplify unit-testing +dist-git-client code, moved to a python module to simplify unit-testing """ import argparse @@ -9,6 +9,7 @@ import logging import shlex import os +import shutil import subprocess import sys from six.moves.urllib.parse import urlparse @@ -370,18 +371,18 @@ def clone(args, config): ]) def _get_argparser(): - parser = argparse.ArgumentParser(prog="copr-distgit-client", + parser = argparse.ArgumentParser(prog="dist-git-client", description="""\ A simple, configurable python utility that is able to download sources from various dist-git instances, and generate source RPMs. The utility is able to automatically map the "origin" .git/config clone URL (or --forked-from URL, if specified) to a corresponding dist-git instance -configured in /etc/copr-distgit-client directory. +configured in /etc/dist-git-client directory. """) # main parser default_confdir = os.environ.get("COPR_DISTGIT_CLIENT_CONFDIR", - "/etc/copr-distgit-client") + "/etc/dist-git-client") parser.add_argument( "--configdir", default=default_confdir, help="Where to load configuration files from") @@ -441,7 +442,7 @@ def _get_argparser(): clone_parser.add_argument( "--dist-git", default="fedora", - help=("The DistGit ID as configured in /etc/copr-distgit-client/"), + help=("The DistGit ID as configured in /etc/dist-git-client/"), ) clone_parser.add_argument( @@ -456,6 +457,29 @@ def _get_argparser(): return parser +def unittests_init_git(files=None): + """ + Initialize .git/ directory. This method is only used for unit-testing. + """ + check_output(["git", "init", ".", "-b", "main"]) + shutil.rmtree(".git/hooks") + check_output(["git", "config", "user.email", "you@example.com"]) + check_output(["git", "config", "user.name", "Your Name"]) + check_output(["git", "config", "advice.detachedHead", "false"]) + + for filename, content in files: + dirname = os.path.dirname(filename) + try: + os.makedirs(dirname) + except OSError: + pass + with open(filename, "w", encoding="utf-8") as filed: + filed.write(content) + check_output(["git", "add", filename]) + + check_output(["git", "commit", "-m", "initial"]) + + def main(): """ The entrypoint for the whole logic """ args = _get_argparser().parse_args() diff --git a/rpmbuild/etc/copr-distgit-client/default.ini b/dist-git-client/etc/default.ini similarity index 100% rename from rpmbuild/etc/copr-distgit-client/default.ini rename to dist-git-client/etc/default.ini diff --git a/dist-git-client/run_tests.sh b/dist-git-client/run_tests.sh new file mode 100755 index 000000000..1d934d688 --- /dev/null +++ b/dist-git-client/run_tests.sh @@ -0,0 +1,18 @@ +#! /bin/bash + +set -e + +args=() + +coverage=( --cov-report term-missing --cov bin --cov dist_git_client ) +for arg; do + case $arg in + --no-coverage) coverage=() ;; + *) args+=( "$arg" ) ;; + esac +done + +abspath=$(readlink -f .) +export PYTHONPATH="${PYTHONPATH+$PYTHONPATH:}$abspath" +export PATH=$(readlink -f bin):$PATH +"${PYTHON:-python3}" -m pytest -s tests "${coverage[@]}" "${args[@]}" diff --git a/rpmbuild/tests/test_distgit_client.py b/dist-git-client/tests/test_dist_git_client.py similarity index 83% rename from rpmbuild/tests/test_distgit_client.py rename to dist-git-client/tests/test_dist_git_client.py index efcca40b9..9b4df4f53 100644 --- a/rpmbuild/tests/test_distgit_client.py +++ b/dist-git-client/tests/test_dist_git_client.py @@ -1,5 +1,5 @@ """ -copr-distgit-client testsuite +dist-git-client testsuite """ import os @@ -13,34 +13,12 @@ except ImportError: import mock -from copr_distgit_client import (sources, srpm, _load_config, check_output, - _detect_clone_url, get_distgit_config, +from dist_git_client import (sources, srpm, _load_config, check_output, + _detect_clone_url, get_distgit_config, unittests_init_git, ) # pylint: disable=useless-object-inheritance -def init_git(files=None): - """ Initialize .git/ directory """ - - check_output(["git", "init", "."]) - shutil.rmtree(".git/hooks") - check_output(["git", "config", "user.email", "you@example.com"]) - check_output(["git", "config", "user.name", "Your Name"]) - check_output(["git", "config", "advice.detachedHead", "false"]) - - for filename, content in files: - dirname = os.path.dirname(filename) - try: - os.makedirs(dirname) - except OSError: - pass - with open(filename, "w") as filed: - filed.write(content) - check_output(["git", "add", filename]) - - check_output(["git", "commit", "-m", "initial"]) - - def git_origin_url(url): """ setup .git/config with core.origin.url == URL """ with open(".git/config", "a+") as gcf: @@ -59,14 +37,14 @@ def setup_method(self, method): _unused_but_needed_for_el6 = (method) testdir = os.path.dirname(__file__) projdir = os.path.dirname(testdir) - self.config_dir = os.path.join(projdir, 'etc/copr-distgit-client') + self.config_dir = os.path.join(projdir, 'etc') self.config = _load_config(self.config_dir) class _Args: # pylint: disable=too-few-public-methods dry_run = False forked_from = None self.args = _Args() - self.workdir = tempfile.mkdtemp(prefix="copr-distgit-test-") + self.workdir = tempfile.mkdtemp(prefix="dist-git-client-test-") os.chdir(self.workdir) def teardown_method(self, method): @@ -74,9 +52,9 @@ def teardown_method(self, method): shutil.rmtree(self.workdir) - @mock.patch('copr_distgit_client.download_file_and_check') + @mock.patch('dist_git_client.download_file_and_check') def test_copr_distgit(self, download): - init_git([ + unittests_init_git([ # .spec in .git, in Copr it is possible ("test.spec", ""), ("sources", "2102fd0602de72e58765adcbf92349d8 retrace-server-git-955.3e4742a.tar.gz\n"), @@ -91,12 +69,12 @@ def test_copr_distgit(self, download): ) @pytest.mark.parametrize('base', ["tar", "tar/"]) - @mock.patch('copr_distgit_client.download_file_and_check') + @mock.patch('dist_git_client.download_file_and_check') def test_fedora_old(self, download, base): """ Old sources format + ssh clone """ - init_git([ + unittests_init_git([ ("tar.spec", ""), ("sources", "0ced6f20b9fa1bea588005b5ad4b52c1 tar-1.26.tar.xz\n"), ]) @@ -109,7 +87,7 @@ def test_fedora_old(self, download, base): ) @pytest.mark.parametrize('base', ["tar.git", "tar.git/"]) - @mock.patch('copr_distgit_client.download_file_and_check') + @mock.patch('dist_git_client.download_file_and_check') def test_fedora_new(self, download, base): """ New sources format + anonymous clone @@ -118,7 +96,7 @@ def test_fedora_new(self, download, base): "1bd13854009b6ee08958481738e6bf661e40216a2befe461d06b4b350eb882e43" "1b3a4eeea7ca1d35d37102df76194c9d933df2b18b3c5401350e9fc17017750" ) - init_git([ + unittests_init_git([ ("tar.spec", ""), ("sources", "SHA512 (tar-1.32.tar.xz) = {0}\n".format(sha512)), ]) @@ -131,12 +109,12 @@ def test_fedora_new(self, download, base): ).format(sha512=sha512) assert download.call_args_list[0][0][0] == url - @mock.patch('copr_distgit_client.download_file_and_check') + @mock.patch('dist_git_client.download_file_and_check') def test_centos(self, download): """ Anonymous centos clone """ - init_git([ + unittests_init_git([ ("SPECS/centpkg-minimal.spec", ""), (".centpkg-minimal.metadata", "cf9ce8d900768ed352a6f19a2857e64403643545 SOURCES/centpkg-minimal.tar.gz\n"), ]) @@ -144,7 +122,7 @@ def test_centos(self, download): sources(self.args, self.config) assert len(download.call_args_list) == 1 assert download.call_args_list[0][0][0] == ( - "https://git.centos.org/sources/centpkg-minimal/master/" + "https://git.centos.org/sources/centpkg-minimal/main/" "cf9ce8d900768ed352a6f19a2857e64403643545" ) assert download.call_args_list[0][0][2]["sources"] == "SOURCES" @@ -164,9 +142,9 @@ def test_centos(self, download): ).format(oldref) - @mock.patch("copr_distgit_client.subprocess.check_call") + @mock.patch("dist_git_client.subprocess.check_call") def test_centos_download(self, patched_check_call): - init_git([ + unittests_init_git([ ("SPECS/centpkg-minimal.spec", ""), (".centpkg-minimal.metadata", "cf9ce8d900768ed352a6f19a2857e64403643545 SOURCES/centpkg-minimal.tar.gz\n"), ]) @@ -216,7 +194,7 @@ def test_load_prefix_fail(self): assert msg in str(err) def test_no_spec(self): - init_git([ + unittests_init_git([ ("sources", "0ced6f20b9fa1bea588005b5ad4b52c1 tar-1.26.tar.xz\n"), ]) git_origin_url("ssh://praiskup@pkgs.fedoraproject.org/rpms/tar") diff --git a/rpmbuild/copr-rpmbuild.spec b/rpmbuild/copr-rpmbuild.spec index 43acc7742..d79c04d91 100644 --- a/rpmbuild/copr-rpmbuild.spec +++ b/rpmbuild/copr-rpmbuild.spec @@ -72,7 +72,7 @@ Requires: sed %if 0%{?fedora} || 0%{?rhel} > 7 Recommends: rpkg Recommends: python-srpm-macros -Recommends: copr-distgit-client +Recommends: dist-git-client Suggests: tito Suggests: rubygem-gem2rpm Suggests: pyp2rpm @@ -88,7 +88,7 @@ build build-id 12345 for chroot epel-7-x86_64. %package -n copr-builder Summary: copr-rpmbuild with all weak dependencies Requires: %{name} = %{version}-%{release} -Requires: copr-distgit-client = %{version}-%{release} +Requires: dist-git-client %if 0%{?fedora} # replacement for yum/yum-utils, to be able to work with el* chroots @@ -151,31 +151,9 @@ build build-id 12345 for chroot epel-7-x86_64. This package contains all optional modules for building SRPM. -%package -n copr-distgit-client -Summary: Utility to download sources from dist-git - -Requires: %{_bindir}/git -Requires: curl -Requires: %{python_pfx}-six -%if 0%{?fedora} || 0%{?rhel} > 9 -Requires: %{python_pfx}-rpmautospec -BuildRequires: %{python_pfx}-rpmautospec -%endif - - -%description -n copr-distgit-client -A simple, configurable python utility that is able to download sources from -various dist-git instances, and generate source RPMs. - -The utility is able to automatically map the .git/config clone URL into -the corresponding dist-git instance configuration. - - %prep %setup -q -for script in bin/copr-rpmbuild* \ - bin/copr-distgit* -do +for script in bin/copr-rpmbuild*; do sed -i '1 s|#.*python.*|#! /usr/bin/%python|' "$script" done @@ -266,19 +244,6 @@ install -p -m 755 copr-update-builder %buildroot%_bindir done ) -install -p -m 755 bin/copr-distgit-client %buildroot%_bindir -argparse-manpage --pyfile copr_distgit_client.py \ - --function _get_argparser \ - --author "Copr Team" \ - --author-email "copr-team@redhat.com" \ - --url %url --project-name Copr \ -> %{buildroot}%{_mandir}/man1/copr-distgit-client.1 -mkdir -p %{buildroot}%{_sysconfdir}/copr-distgit-client -install -p -m 644 etc/copr-distgit-client/default.ini \ - %{buildroot}%{_sysconfdir}/copr-distgit-client -mkdir -p %{buildroot}%{sitelib} -install -p -m 644 copr_distgit_client.py %{buildroot}%{expand:%%%{python}_sitelib} - %files %{!?_licensedir:%global license %doc} @@ -311,18 +276,6 @@ install -p -m 644 copr_distgit_client.py %{buildroot}%{expand:%%%{python}_siteli %doc %mock_config_overrides/README -%files -n copr-distgit-client -%license LICENSE -%_bindir/copr-distgit-client -%_mandir/man1/copr-distgit-client.1* -%dir %_sysconfdir/copr-distgit-client -%config %_sysconfdir/copr-distgit-client/default.ini -%sitelib/copr_distgit_client.* -%if "%{?python}" != "python2" -%sitelib/__pycache__/copr_distgit_client* -%endif - - %changelog * Tue May 21 2024 Jakub Kadlcik 0.73-1 - Remove static methods from tests diff --git a/rpmbuild/tests/test_distgit.py b/rpmbuild/tests/test_distgit.py index f0c698065..08fa6c987 100644 --- a/rpmbuild/tests/test_distgit.py +++ b/rpmbuild/tests/test_distgit.py @@ -10,7 +10,7 @@ import configparser import pytest -from copr_distgit_client import check_output +from dist_git_client import check_output, unittests_init_git from copr_rpmbuild.providers.distgit import DistGitProvider from copr_rpmbuild.helpers import git_clone_and_checkout @@ -20,7 +20,6 @@ # Python 2 version depends on mock import mock -from tests.test_distgit_client import init_git from tests import TestCase class TestDistGitProvider(TestCase): @@ -66,7 +65,7 @@ def setup_method(self, method): output = check_output(['md5sum', datafile]) md5 = output.decode("utf-8").strip().split(' ')[0] - init_git([ + unittests_init_git([ ("test.spec", "specfile_content\n"), ("sources", "{md5} datafile\n".format(md5=md5)), ])