From 2d7a6789be0334935a362676fcb13182ac5b9780 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 Jul 2013 08:45:18 -0500 Subject: [PATCH 1/5] Fixing bug that effectively broke document support in 0.4.0.. how embarassing :( This fix sponsored by Christophe Drevet. Thank you! --- mediagoblin/media_types/pdf/processing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py index 49742fd7..b5adb5e6 100644 --- a/mediagoblin/media_types/pdf/processing.py +++ b/mediagoblin/media_types/pdf/processing.py @@ -250,8 +250,8 @@ def process_pdf(proc_state): else: pdf_filename = queued_filename.rsplit('.', 1)[0] + '.pdf' unoconv = where('unoconv') - call(executable=unoconv, - args=[unoconv, '-v', '-f', 'pdf', queued_filename]) + Popen(executable=unoconv, + args=[unoconv, '-v', '-f', 'pdf', queued_filename]).wait() if not os.path.exists(pdf_filename): _log.debug('unoconv failed to convert file to pdf') raise BadMediaFail() From bed9ad06b79eae9072d3172ddcf4cc5e778441a9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 Jul 2013 11:41:29 -0500 Subject: [PATCH 2/5] Release notes v0.4.1 ... fixes serious issue with conversion via libreoffice. This commit sponsored by William Linna. Thank you! --- docs/source/siteadmin/relnotes.rst | 11 +++++++++++ mediagoblin/_version.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 7b6d8353..e8c9477e 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -21,6 +21,17 @@ This chapter has important information for releases in it. If you're upgrading from a previous release, please read it carefully, or at least skim over it. +0.4.1 +===== + +This is a bugfix release for 0.4.0. This only implements one major +fix in the newly released document support which prevented the +"conversion via libreoffice" feature. + +If you were running 0.4.0 you can upgrade to v0.4.1 via a simple +switch and restarting mediagoblin/celery with no other actions. + + 0.4.0 ===== diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index cb230a60..1aa0e2c4 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.4.0" +__version__ = "0.4.1" From cd1fda4d947bf13ed3708859f83cef6160538751 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 Jul 2013 13:34:49 -0500 Subject: [PATCH 3/5] PyTest needs to be >= 2.3.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f320e92c..f28a2bb0 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup( 'PasteScript', 'wtforms', 'py-bcrypt', - 'pytest>=2.3', + 'pytest>=2.3.1', 'pytest-xdist', 'werkzeug>=0.7', 'celery==2.5.3', From 20e4e6c140f852e5142f930dd15684497fb9468a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 22 Jun 2013 12:25:31 -0500 Subject: [PATCH 4/5] Fix by Rodney Ewing so render_http_exception works with newer Werkzeug versions. This commit back-cherry-picked from current master for the 0.4.1 fix release. --- mediagoblin/tools/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index aaf31d0b..0be1f835 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -77,7 +77,7 @@ def render_http_exception(request, exc, description): elif stock_desc and exc.code == 404: return render_404(request) - return render_error(request, title=exc.args[0], + return render_error(request, title='{0} {1}'.format(exc.code, exc.name), err_msg=description, status=exc.code) From d3b1fd2e606f549c5ecc2a31c94d90aa93794005 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 Jul 2013 16:29:50 -0500 Subject: [PATCH 5/5] Updating docs regarding pulling in and fetching git submodules We use this for PDF.js now... we should reference that. This commit sponsored by Bonnie King. Thanks! --- docs/source/siteadmin/deploying.rst | 5 +++-- docs/source/siteadmin/relnotes.rst | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 0ee6b5b4..9d7f83c1 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -157,9 +157,10 @@ directory. Modify these commands to reflect your own environment:: mkdir -p /srv/mediagoblin.example.org/ cd /srv/mediagoblin.example.org/ -Clone the MediaGoblin repository:: +Clone the MediaGoblin repository and set up the git submodules:: git clone git://gitorious.org/mediagoblin/mediagoblin.git + git submodule init && git submodule fetch And set up the in-package virtualenv:: @@ -194,7 +195,7 @@ This concludes the initial configuration of the development environment. In the future, when you update your codebase, you should also run:: - ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate + ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate && git submodule fetch Note: If you are running an active site, depending on your server configuration, you may need to stop it first or the dbupdate command diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index e8c9477e..2666b0a8 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -31,6 +31,8 @@ fix in the newly released document support which prevented the If you were running 0.4.0 you can upgrade to v0.4.1 via a simple switch and restarting mediagoblin/celery with no other actions. +Otherwise, follow 0.4.0 instructions. + 0.4.0 ===== @@ -56,6 +58,9 @@ switch and restarting mediagoblin/celery with no other actions. 5. We now use itsdangerous for sessions; if you had any references to beaker in your paste config you can remove them. Again, see the default paste.ini config +6. We also now use git submodules. Please do: + ``git submodule init && git submodule fetch`` + You will need to do this to use the new PDF support. **For theme authors**