diff --git a/UPGRADING.rst b/UPGRADING.rst
index a9979e5..2f7bbed 100644
--- a/UPGRADING.rst
+++ b/UPGRADING.rst
@@ -1,6 +1,55 @@
Upgrading Pagure
================
+From 2.15 to 3.0
+----------------
+
+The 3.0 version was released with some major re-architecturing. The interaction
+with the backend git repo (being the main source repo or the tickets or requests
+repos) are now done by a worker that is triggered via a message queue.
+This communication is done using `celery `_ and
+via one of the message queue celery supports (pagure currently defaulting to
+`redis `_.
+So to get pagure 3.0 running, you will need to get your own message queue (such
+as redis) up running and configured in pagure's configuration.
+
+This major version bump has also been an opportunity to rename all the services
+to use the same naming schema of pagure-.
+The rename is as such:
+
++------------------+-----------------+
+| In 2.x | From 3.0 |
++==================+=================+
+| pagure-ci | pagure-ci |
++------------------+-----------------+
+| ev-server | pagure-ev |
++------------------+-----------------+
+| pagure-loadjson | pagure-loadjson |
++------------------+-----------------+
+| pagure-logcom | pagure-logcom |
++------------------+-----------------+
+| milters | pagure-milters |
++------------------+-----------------+
+| webhook-server | pagure-webhook |
++------------------+-----------------+
+| | pagure-worker |
++------------------+-----------------+
+
+.. note:: This last service is the service mentioned above and it is part of
+ pagure core, not optional unlike the other services in this table.
+
+This release also introduces some new configuration keys:
+
+- ``CELERY_CONFIG`` defaults to ``{}``
+- ``ATTACHMENTS_FOLDER``, to be configured
+- ``GITOLITE_BACKEND`` defaults to ``gitolite3``, deprecates ``GITOLITE_VERSION``
+- ``EXTERNAL_COMMITTER`` defaults to ``{}``
+- ``REQUIRED_GROUPS`` defaults to ``{}``
+
+This version also introduces a few database changes, so you will need to update
+the database schema using alembic: ``alembic upgrade head``.
+
+
From 2.14 to 2.15
-----------------
diff --git a/doc/contributors.rst b/doc/contributors.rst
index 2a73c64..4d937d2 100644
--- a/doc/contributors.rst
+++ b/doc/contributors.rst
@@ -3,28 +3,28 @@ Contributors to pagure
Pagure would be nothing without its contributors.
-On May 18, 2017 (release 2.15.1), the list looks as follow:
+On June 30, 2017 (release 3.0), the list looks as follow:
================= ===========
Number of commits Contributor
================= ===========
- 5242 Pierre-Yves Chibon
+ 5311 Pierre-Yves Chibon
191 Ryan Lerch
+ 140 Vivek Anand
139 farhaanbukhsh
- 138 Vivek Anand
+ 126 Patrick Uiterwijk
77 Farhaan Bukhsh
- 60 Clement Verna
+ 62 Clement Verna
59 Johan Cwiklinski
- 51 Patrick Uiterwijk
47 Mark Reynolds
32 Pradeep CE (cep)
30 Lubomír Sedlář
+ 26 Matt Prahl
22 rahul Bajaj
20 Jeremy Cline
19 Gaurav Kumar
- 19 Matt Prahl
+ 18 Abhijeet Kasurde
18 Sayan Chowdhury
- 17 Abhijeet Kasurde
15 Ralph Bean
15 Vibhor Verma
14 Justin W. Flory
@@ -33,6 +33,7 @@ Number of commits Contributor
13 Mathieu Bridon
8 Adam Williamson
8 Lei Yang
+ 8 Shengjing Zhu
5 Mike McLean
5 Oliver Gutierrez
5 Paul W. Frields
@@ -49,6 +50,7 @@ Number of commits Contributor
3 Jason Tibbitts
3 Kushal Khandelwal
3 Pedro Lima
+ 3 Ricky Elrod
3 Sergio Durigan Junior
3 Till Maas
3 bill auger
@@ -60,11 +62,11 @@ Number of commits Contributor
2 Nuno Maltez
2 Rahul Bajaj
2 Richard Marko
- 2 Ricky Elrod
- 2 Shengjing Zhu
2 Simo Sorce
+ 2 Tim Flink
2 William Moreno Reyes
2 bruno
+ 2 clime
2 dhrish20
2 shivani
2 “AnjaliPardeshi” <“anjalipardeshi92@gmail.com”>
@@ -92,7 +94,6 @@ Number of commits Contributor
1 abhishek
1 abhishek goswami
1 alunux
- 1 clime
1 d3prof3t
1 jcvicelli
1 pingou
@@ -101,6 +102,7 @@ Number of commits Contributor
1 ryanlerch
1 skrzepto
1 smit thakkar
+ 1 smurfix
1 vibhcool
================= ===========
diff --git a/files/pagure.spec b/files/pagure.spec
index 888fd0d..d670f4e 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -2,7 +2,7 @@
%distutils.sysconfig import get_python_lib; print (get_python_lib())")}
Name: pagure
-Version: 2.15.1
+Version: 3.0
Release: 1%{?dist}
Summary: A git-centered forge
@@ -230,6 +230,7 @@ install -m 644 files/alembic.ini $RPM_BUILD_ROOT/%{_sysconfdir}/pagure/alembic.i
cp -r alembic $RPM_BUILD_ROOT/%{_datadir}/pagure
# Install the systemd file for the worker
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
install -m 644 files/pagure_worker.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_worker.service
@@ -237,7 +238,6 @@ install -m 644 files/pagure_worker.service \
# Install the milter files
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pagure
mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
install -m 0644 pagure-milters/milter_tempfile.conf \
$RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}-milter.conf
install -m 644 pagure-milters/pagure_milter.service \
@@ -384,6 +384,64 @@ install -m 644 pagure-loadjson/pagure_loadjson.service \
%changelog
+* Fri Jun 30 2017 Pierre-Yves Chibon - 3.0-1
+- Update to 3.0
+- Since 2.90 celery has become a requirement as well as one of the queueing
+ system it supports (pagure defaults to using redis)
+- Multiple stability and performance improvements (mainly thanks to Patrick
+ Uiterwijk)
+- Fix the assignee value in fedmsg when assigning a ticket (Ricky Elrod)
+- Make pagure support bleach 2.0.0 (Shengjing Zhu)
+- Fixes in CI support (Tim Flink)
+- Update the documentation
+- Fix plain readme html escape (Shengjing Zhu)
+- Refactor user existence code in API and UI (Abhijeet Kasurde)
+- Add an API to modify a Pagure project's owner (Matt Prahl)
+- Support for uploading multiple files to an issue at once
+- Introduce the external committer feature
+- Add the required groups feature
+- Add an API endpoint to get the git urls of a project (Matt Prahl)
+- Blacklist 'wait' as project name
+- Add a border to the search box on the side bar to the documentation
+- Add the list-id, list-archive and X-Auto-Response-Suppress email headers
+- Add ways to customize the gitolite configuration file with snippets
+- Return a 404 on private ticket if the user is not authenticated
+- cleanup: move static js/css to vendor dir
+- Limit the requests version as it conflicts with our chardet requirement
+- Rename all the services to pagure-*
+- Remove 'on - 2.90.1-1
+- Update to 2.90.1
+- Fix the systemd service file for the worker, needs to have the full path
+ (Patrick Uiterwijk and I)
+- Fix the logcom server (Patrick Uiterwijk)
+- Use python-redis instead of trollius-redis to correctly clean up when client
+ leaves on the EV server (Patrick Uiterwijk)
+
+* Tue May 23 2017 Pierre-Yves Chibon - 2.90.0-1
+- Bump to 2.90, pre-release of 3.0
+- Re-architecture the interactions with git (especially the writing part) to be
+ handled by an async worker (Patrick Uiterwijk)
+- Add the ability to filter projects by owner (Matt Prahl)
+
* Thu May 18 2017 Pierre-Yves Chibon - 2.15.1-1
- Update to 2.15.1
- Fix the requirements on straight.plugin in the requirements.txt file
diff --git a/pagure/__init__.py b/pagure/__init__.py
index 335a12a..5d9d7f5 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -12,8 +12,8 @@
__requires__ = ['SQLAlchemy >= 0.8', 'jinja2 >= 2.4']
import pkg_resources # noqa: E402,F401
-__version__ = '2.15.1'
-__api_version__ = '0.13'
+__version__ = '3.0'
+__api_version__ = '0.14'
import datetime # noqa: E402