commit pagure for openSUSE:Factory
Hello community,
here is the log from the commit of package pagure for openSUSE:Factory checked in at 2019-04-01 12:38:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pagure (Old)
and /work/SRC/openSUSE:Factory/.pagure.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pagure"
Mon Apr 1 12:38:16 2019 rev:7 rq:689885 version:5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/pagure/pagure.changes 2019-02-24 17:20:37.348394739 +0100
+++ /work/SRC/openSUSE:Factory/.pagure.new.25356/pagure.changes 2019-04-01 12:38:20.453914009 +0200
@@ -1,0 +2,22 @@
+Fri Mar 29 13:50:54 UTC 2019 - Neal Gompa
From 47a9abb72e96fac3b03ecefb021a4ec1e8fc95f3 Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza
Date: Thu, 14 Mar 2019 12:56:06 +0100 Subject: [PATCH] pagure-ev: python 3 compatibility
--- pagure-ev/pagure_stream_server.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pagure-ev/pagure_stream_server.py b/pagure-ev/pagure_stream_server.py index 0e4a99a1..4439c917 100644 --- a/pagure-ev/pagure_stream_server.py +++ b/pagure-ev/pagure_stream_server.py @@ -26,7 +26,7 @@ import os import redis -from trololio import asyncio as trololio +import trololio from six.moves.urllib.parse import urlparse @@ -137,7 +137,7 @@ def handle_client(client_reader, client_writer): data = None while True: # give client a chance to respond, timeout after 10 seconds - line = yield trololio.From(trololio.wait_for( + line = yield trololio.From(trololio.asyncio.wait_for( client_reader.readline(), timeout=10.0)) if not line.decode().strip(): @@ -199,7 +199,7 @@ def handle_client(client_reader, client_writer): oncall = 0 oncall += 1 yield trololio.From(client_writer.drain()) - yield trololio.From(trololio.sleep(1)) + yield trololio.From(trololio.asyncio.sleep(1)) else: log.info("Sending %s", msg['data']) client_writer.write(('data: %s\n\n' % msg['data']).encode()) @@ -243,8 +243,8 @@ def main(): _get_session() try: - loop = trololio.get_event_loop() - coro = trololio.start_server( + loop = trololio.asyncio.get_event_loop() + coro = trololio.asyncio.start_server( handle_client, host=None, port=pagure.config.config['EVENTSOURCE_PORT'], @@ -253,7 +253,7 @@ def main(): log.info( 'Serving server at {}'.format(SERVER.sockets[0].getsockname())) if pagure.config.config.get('EV_STATS_PORT'): - stats_coro = trololio.start_server( + stats_coro = trololio.asyncio.start_server( stats, host=None, port=pagure.config.config.get('EV_STATS_PORT'), -- 2.20.1 ++++++ 0501-Revert-Add-a-upper-limit-to-sqlalchemy.patch ++++++
From ee99a5a4a503b5b1b6b6c20876fafafa4dd6b96a Mon Sep 17 00:00:00 2001 From: Neal Gompa
Date: Fri, 29 Mar 2019 08:24:05 -0400 Subject: [PATCH] Revert "Add a upper limit to sqlalchemy as 1.3.0 breaks our tests"
This is required so that Pagure is installable with SQLAlchemy 1.3.0+. The issues that affect the tests are limited to the SQLite backend, and do not affect production deployments using PostgreSQL or MySQL/MariaDB. This reverts commit b92a6f378bc81890ed2c1c70c84bce687238b617. --- requirements.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index c877d94e..996fb063 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,12 +26,7 @@ python-openid-teams redis requests six -# sqlalchemy minimum 0.8 -# sqlalchemy 1.3.0 is causing issues on the pip container leading -# test_pagure_lib.py to raise a: -# "(sqlite3.OperationalError) no such column: users.user" -# in test_search_projects_private line 319 -sqlalchemy < 1.3.0 +sqlalchemy >= 0.8 # 1.4.0 is broken, 1.4.0-post-1 works but gives odd results on newer setuptools # the latest version 1.5.0 is also known to work straight.plugin -- 2.20.1 ++++++ pagure-5.3.tar.gz -> pagure-5.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/pagure/pagure-5.3.tar.gz /work/SRC/openSUSE:Factory/.pagure.new.25356/pagure-5.4.tar.gz differ: char 5, line 1 ++++++ pagure-README.SUSE ++++++ --- /var/tmp/diff_new_pack.8odsuA/_old 2019-04-01 12:38:22.269914883 +0200 +++ /var/tmp/diff_new_pack.8odsuA/_new 2019-04-01 12:38:22.269914883 +0200 @@ -100,7 +100,9 @@ firewall-cmd --add-service=redis firewall-cmd --runtime-to-permanent -8. Enable and start pagure_worker and pagure_gitolite_worker +8. Enable and start pagure services + +systemctl enable --now pagure_worker pagure_gitolite_worker pagure_api_key_expire_mail.timer pagure_mirror_project_in.timer 9. Enable and start apache2, or restart if it's already running
participants (1)
-
root