March 2014 - copr-commits - Fedora Mailing-Lists

[copr] master: building pkgs separately (4e04de0)

by asamalik＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 4e04de0f790365d4400c804920ef09f1979275de Author: Adam Samalik <asamalik(a)redhat.com> Date: Thu Mar 20 11:48:29 2014 +0100 building pkgs separately >--------------------------------------------------------------- cli/copr_cli/subcommands.py | 48 +++++++++++--------- .../coprs/views/api_ns/api_general.py | 34 +++++++++----- .../coprs/views/coprs_ns/coprs_builds.py | 14 +++--- .../coprs/views/coprs_ns/coprs_general.py | 11 +++-- 4 files changed, 62 insertions(+), 45 deletions(-) diff --git a/cli/copr_cli/subcommands.py b/cli/copr_cli/subcommands.py index 5b99e80..e83d474 100644 --- a/cli/copr_cli/subcommands.py +++ b/cli/copr_cli/subcommands.py @@ -236,29 +236,35 @@ def build(copr, pkgs, memory, timeout, wait=True, result=None): print(output["message"]) if wait: - print("Build ID: {0}".format(output["id"])) - print("Watching build (this may be safely interrupted)...") - prevstatus = None - if result is not None: - result['id'] = output["id"] + print("{0} builds were added.".format(len(output["ids"]))) + print("Watching builds (this may be safely interrupted)...") + prevstatus = {} + for id in output["ids"]: + prevstatus[id] = None + if result is not None: + result[id] = {} try: while True: - (ret, status) = _fetch_status(output["id"]) - if not ret: - errmsg = "Unable to get build status: {0}".format(status) - print errmsg - if result is not None: - result['errmsg'] = errmsg - return False - - now = datetime.datetime.now() - if prevstatus != status: - print("{0} {1}".format(now.strftime("%H:%M:%S"), status)) - prevstatus = status - - if status in ["succeeded", "failed"]: - if result is not None: - result['status'] = status + for id in output["ids"]: + (ret, status) = _fetch_status(id) + if not ret: + errmsg = "Build {1}: Unable to get build status: {0}".format(status,id) + print errmsg + if result is not None: + result[id]['errmsg'] = errmsg + return False + + now = datetime.datetime.now() + if prevstatus[id] != status: + print("{0} Build {2}: {1}".format(now.strftime("%H:%M:%S"), status, id)) + prevstatus[id] = status + + if status in ["succeeded", "failed"]: + if result is not None: + result[id]['status'] = status + output["ids"].remove(id) + + if not output["ids"]: return True time.sleep(60) diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py index 7ad8987..8334776 100644 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -82,10 +82,12 @@ def api_new_copr(username): infos.append("New project was successfully created.") if form.initial_pkgs.data: - builds_logic.BuildsLogic.add( - user=flask.g.user, - pkgs=" ".join(form.initial_pkgs.data.split()), - copr=copr) + pkgs = form.initial_pkgs.data.split() + for pkg in pkgs: + builds_logic.BuildsLogic.add( + user=flask.g.user, + pkgs=pkg, + copr=copr) infos.append("Initial packages were successfully " "submitted for building.") @@ -208,19 +210,25 @@ def copr_new_build(username, coprname): else: if form.validate_on_submit() and flask.g.user.can_build_in(copr): # we're checking authorization above for now - build = builds_logic.BuildsLogic.add( - user=flask.g.user, - pkgs=form.pkgs.data.replace('\n', ' '), - copr=copr) + # and also creating separate build for each package + pkgs=form.pkgs.data.replace('\n', ' ').split(" ") + ids = [] + for pkg in pkgs: + build = builds_logic.BuildsLogic.add( + user=flask.g.user, + pkgs=pkg, + copr=copr) - if flask.g.user.proven: - build.memory_reqs = form.memory_reqs.data - build.timeout = form.timeout.data + if flask.g.user.proven: + build.memory_reqs = form.memory_reqs.data + build.timeout = form.timeout.data + + db.session.commit() + ids.append(build.id) - db.session.commit() output = {"output": "ok", - "id": build.id, + "ids": ids, "message": "Build was added to {0}.".format(coprname)} else: output = {"output": "notok", "error": "Invalid request"} diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index dbcc3dd..8231050 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -63,13 +63,13 @@ def copr_new_build(username, coprname): if form.validate_on_submit(): try: - build = builds_logic.BuildsLogic.add(user=flask.g.user, - pkgs=form.pkgs.data.replace( - "\n", " "), - copr=copr) - if flask.g.user.proven: - build.memory_reqs = form.memory_reqs.data - build.timeout = form.timeout.data + pkgs = pkgs=form.pkgs.data.replace("\n", " ").split(" ") + for pkg in pkgs: + build = builds_logic.BuildsLogic.add(user=flask.g.user, + pkgs=pkg, copr=copr) + if flask.g.user.proven: + build.memory_reqs = form.memory_reqs.data + build.timeout = form.timeout.data except (ActionInProgressException, InsufficientRightsException) as e: flask.flash(str(e)) diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index cf56e12..f29c590 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -118,10 +118,13 @@ def copr_new(username): flask.flash("New project was successfully created.") if form.initial_pkgs.data: - builds_logic.BuildsLogic.add( - flask.g.user, - pkgs=form.initial_pkgs.data.replace("\n", " "), - copr=copr) + # we need to build each package separately now + pkgs = form.initial_pkgs.data.replace("\n", " ").split(" ") + for pkg in pkgs: + builds_logic.BuildsLogic.add( + flask.g.user, + pkgs=pkg, + copr=copr) db.session.commit() flask.flash("Initial packages were successfully submitted "

10 years, 1 month

1
0
0 / 0

[copr] master: [frontend] let apache log in default location (252a9d2)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 252a9d27cc7eca95cdb3b95c311cd43e2a012632 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 20 14:45:38 2014 +0100 [frontend] let apache log in default location unless we provide logrotate for those files it can become quite huge >--------------------------------------------------------------- frontend/coprs_frontend/coprs.conf.example | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/coprs_frontend/coprs.conf.example b/frontend/coprs_frontend/coprs.conf.example index 7162d5f..61ebe77 100644 --- a/frontend/coprs_frontend/coprs.conf.example +++ b/frontend/coprs_frontend/coprs.conf.example @@ -6,8 +6,8 @@ WSGIScriptAlias / /usr/share/copr/coprs_frontend/application WSGIProcessGroup 127.0.0.1 - ErrorLog logs/error_coprs - CustomLog logs/access_coprs common + #ErrorLog logs/error_log + #CustomLog logs/access_log common <Directory /usr/share/copr> WSGIApplicationGroup %{GLOBAL}

10 years, 1 month

1
0
0 / 0

[copr] master: api: fix KeyError in search (063530f)

by Richard Marko

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 063530f1e459f1b59757d3011c678a851ab50798 Author: Richard Marko <rmarko(a)fedoraproject.org> Date: Thu Mar 20 13:35:04 2014 +0100 api: fix KeyError in search Exception on /api/coprs/search/tests/ [GET] Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/flask/app.py", line 1687, in wsgi_app response = self.full_dispatch_request() File "/usr/lib/python2.7/site-packages/flask/app.py", line 1360, in full_dispatch_request rv = self.handle_user_exception(e) File "/usr/lib/python2.7/site-packages/flask/app.py", line 1358, in full_dispatch_request rv = self.dispatch_request() File "/usr/lib/python2.7/site-packages/flask/app.py", line 1344, in dispatch_request return self.view_functions[rule.endpoint](**req.view_args) File "/usr/share/copr/coprs_frontend/coprs/views/api_ns/api_general.py", line 409, in api_coprs_search_by_project output["repos"].append({"username": repo.owner, KeyError: 'repos' Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org> >--------------------------------------------------------------- .../coprs/views/api_ns/api_general.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py index f792977..7ad8987 100644 --- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py @@ -404,7 +404,7 @@ def api_coprs_search_by_project(project=None): flask.g.user, project) repos = query.all() - output = {"output": "ok", "users": []} + output = {"output": "ok", "repos": []} for repo in repos: output["repos"].append({"username": repo.owner, "coprname": repo.name,

10 years, 1 month

1
0
0 / 0

[copr] tag 'copr-frontend-1.30-1' created

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-frontend-1.30-1 Referencing: 8d2dc860048c3e9633b60fa70bffff2a30e4cd3f

10 years, 1 month

1
0
0 / 0

[copr] master: Automatic commit of package [copr-frontend] release [1.30-1]. (7329a7a)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 7329a7a446b2ccc06db311cb2e952f7fb825bb6b Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Mar 19 16:16:08 2014 +0100 Automatic commit of package [copr-frontend] release [1.30-1]. >--------------------------------------------------------------- frontend/copr-frontend.spec | 8 +++++++- rel-eng/packages/copr-frontend | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index 8e7d542..7758d2a 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -5,7 +5,7 @@ %endif Name: copr-frontend -Version: 1.29 +Version: 1.30 Release: 1%{?dist} Summary: Frontend for Copr @@ -160,6 +160,12 @@ service httpd condrestart %doc %{_pkgdocdir}/python-doc %changelog +* Wed Mar 19 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.30-1 +- Fix typo in API doc HTML +- white background +- status page +- create _pkgdocdir + * Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1 - move frontend to standalone package diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend index fd9a8bd..275d6e2 100644 --- a/rel-eng/packages/copr-frontend +++ b/rel-eng/packages/copr-frontend @@ -1 +1 @@ -1.29-1 frontend/ +1.30-1 frontend/

10 years, 1 month

1
0
0 / 0

[copr] tag 'copr-cli-1.30-1' created

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-cli-1.30-1 Referencing: f6b41ee73383c7c6e596e51e8b10fc81857b9b52

10 years, 1 month

1
0
0 / 0

[copr] master: Automatic commit of package [copr-cli] release [1.30-1]. (9c51a84)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 9c51a847c59ea8734adf44827ba683b2cab5e3ec Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Mar 19 10:21:40 2014 +0100 Automatic commit of package [copr-cli] release [1.30-1]. >--------------------------------------------------------------- cli/copr-cli.spec | 8 +++++++- rel-eng/packages/copr-cli | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cli/copr-cli.spec b/cli/copr-cli.spec index 66fab2c..79fbf34 100644 --- a/cli/copr-cli.spec +++ b/cli/copr-cli.spec @@ -4,7 +4,7 @@ %endif Name: copr-cli -Version: 1.29 +Version: 1.30 Release: 1%{?dist} Summary: Command line interface for COPR @@ -96,6 +96,12 @@ cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Wed Mar 19 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.30-1 +- BR make is not needed +- build -doc subpackage only for fedoras +- add LICENSE to -doc +- replace 'copr' with 'project' + * Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1 - move copr-cli in standalone package diff --git a/rel-eng/packages/copr-cli b/rel-eng/packages/copr-cli index a94aebd..7f3a793 100644 --- a/rel-eng/packages/copr-cli +++ b/rel-eng/packages/copr-cli @@ -1 +1 @@ -1.29-1 cli/ +1.30-1 cli/

10 years, 1 month

1
0
0 / 0

[copr] master: [cli] build -doc subpackage only for fedoras (ce07aaf)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit ce07aaff95e013e533c7bf649922a5f55f1715cf Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Mar 19 09:53:32 2014 +0100 [cli] build -doc subpackage only for fedoras Generating documentation on el6 fails >--------------------------------------------------------------- cli/copr-cli.spec | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cli/copr-cli.spec b/cli/copr-cli.spec index 8995519..a9cd0e3 100644 --- a/cli/copr-cli.spec +++ b/cli/copr-cli.spec @@ -44,6 +44,7 @@ and submit new builds and COPR will create yum repository from latests builds. This package contains command line interface. +%if 0%{?fedora} %package doc Summary: Code documentation for COPR @@ -53,7 +54,7 @@ and submit new builds and COPR will create yum repository from latests builds. This package include documentation for COPR code. Mostly useful for developers only. - +%endif %prep %setup -q @@ -65,10 +66,12 @@ mv copr_cli/README.rst ./ # convert manages a2x -d manpage -f manpage man/copr-cli.1.asciidoc +%if 0%{?fedora} # build documentation pushd documentation make %{?_smp_mflags} python popd +%endif %install install -d %{buildroot}%{_pkgdocdir}/ @@ -77,7 +80,9 @@ install -d %{buildroot}%{_mandir}/man1 install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/ #doc +%if 0%{?fedora} cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/ +%endif %files %doc LICENSE README.rst @@ -85,10 +90,11 @@ cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/ %{python_sitelib}/* %{_mandir}/man1/copr-cli.1* +%if 0%{?fedora} %files doc %doc LICENSE %doc %{_pkgdocdir}/python-doc - +%endif %changelog * Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1

10 years, 1 month

1
0
0 / 0

[copr] master: BR make is not needed (a3bfb7e)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit a3bfb7e5657c1585c849628aa6fcc4fc07f0efff Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Mar 19 10:04:30 2014 +0100 BR make is not needed See: http://fedoraproject.org/wiki/Packaging/Guidelines#Exceptions_2 >--------------------------------------------------------------- cli/copr-cli.spec | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/cli/copr-cli.spec b/cli/copr-cli.spec index a9cd0e3..66fab2c 100644 --- a/cli/copr-cli.spec +++ b/cli/copr-cli.spec @@ -30,7 +30,6 @@ BuildRequires: python-argparse #for doc package BuildRequires: epydoc BuildRequires: graphviz -BuildRequires: make Requires: python-requests Requires: python-setuptools

10 years, 1 month

1
0
0 / 0

[copr] master: [cli] add LICENSE to -doc (a991919)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit a991919c54827c1ffb81ef6dc0867f25bb823b83 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Mar 19 09:49:12 2014 +0100 [cli] add LICENSE to -doc >--------------------------------------------------------------- cli/copr-cli.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cli/copr-cli.spec b/cli/copr-cli.spec index b5b16c6..8995519 100644 --- a/cli/copr-cli.spec +++ b/cli/copr-cli.spec @@ -86,6 +86,7 @@ cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/ %{_mandir}/man1/copr-cli.1* %files doc +%doc LICENSE %doc %{_pkgdocdir}/python-doc

10 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

copr-commits March 2014