From 8b6e56d9d89ba92fb1a67a0febac8334192ddc83 Mon Sep 17 00:00:00 2001 From: Vitor Baptista Date: Fri, 18 Oct 2013 11:23:04 -0300 Subject: [PATCH 01/15] [#1155] Document how to upgrade the dependencies --- CONTRIBUTING.rst | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7b15f8d5531..79bd8f77b5b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -236,3 +236,65 @@ Merging a Pull Request If you're reviewing a pull request for CKAN, when merging a branch into master: - Use the ``--no-ff`` option in the ``git merge`` command, + + +-------------------------- +Upgrading the dependencies +-------------------------- + +CKAN's dependencies are pinned to specific versions, so we can guarantee that +no matter when you install it, you'll always get the same dependencies' +versions our code was tested with. + +We couldn't simply leave everything in our requirements.txt file, though. +Sometimes, we discover that one dependency releases a new version that's +incompatible with CKAN, so we need a way to enforce that we won't upgrade it +unexpectedly in the future. We also split between dev and non-dev requirements, +so production servers don't need to install dependencies only used for testing, +for example. + +Our dependencies are split in 3 files: ``requirements.in``, +``requirements.txt``, and ``dev-requirements.txt``. + +requirements.in + Contains our direct dependencies (i.e. not our dependencies' dependencies), + with loosely defined versions. For example, ``apachemiddleware>=0.1.1,<0.2``. + +requirements.txt + Contains every dependency, including indirect, pinned to a specific + version. Created with ``pip freeze``. For example, ``simplejson==3.3.1``. + +dev-requirements.txt + Contains our development dependencies, pinned to a specific version. For + example, ``factory-boy==2.1.1``. + +We haven't created a ``dev-requirement.in`` because we have too few dev +dependencies, we don't update them often, and none of them have a known +incompatible version. + +Steps to upgrade +================ + +#. Create a new virtualenv: ``virtualenv --no-site-packages upgrading`` + +#. Install the requirements with unpinned versions: ``pip install -r + requirements.in`` + +#. Save the new dependencies versions: ``pip freeze > requirements.txt``. We + have to do this before installing the other dependencies so we get only what + was in ``requirements.in`` + +#. Install CKAN: ``python setup.py develop`` + +#. Install the development dependencies: ``pip install -r + dev-requirements.txt`` + +#. Run the tests to make sure everything still works (see :doc:`test`). + + - If not, try to fix the problem. If it's too complicated, pinpoint which + dependency's version broke our tests, find an older version that still + works, and add it to ``requirements.in``. Go back to step 1. + +#. Navigate a bit on CKAN to make sure the tests didn't miss anything. Review + the dependencies changes and their changelogs. If everything seems fine, go + ahead and fill a pull request (see :ref:`making a pull request`). From 12b5d386b150b2072dc6680996a11b8b524199fb Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 25 Oct 2013 11:51:56 +0100 Subject: [PATCH 02/15] [#1294] Update docs theme to latest version --- doc/_themes/sphinx-theme-okfn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn index 320555990b6..59688a6679f 160000 --- a/doc/_themes/sphinx-theme-okfn +++ b/doc/_themes/sphinx-theme-okfn @@ -1 +1 @@ -Subproject commit 320555990b639c99ac3bcc79024140c9588e2bdf +Subproject commit 59688a6679f3373a57e8d4e60e43f1b249878eb3 From 5550a4a34e481441c8cdc2ac6f40ebcbfad95663 Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 25 Oct 2013 11:58:12 +0100 Subject: [PATCH 03/15] [#1294] Fix logo on docs header bar The logo needs to be in a _static folder because the sphinx-theme-okfn hardcodes it there: https://github.com/okfn/sphinx-theme-okfn/blob/master/layout.html#L18 --- doc/_static/ckanlogo.png | Bin 0 -> 1303 bytes doc/conf.py | 4 ++-- doc/images/ckan_logo_box.png | Bin 5246 -> 0 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 doc/_static/ckanlogo.png delete mode 100644 doc/images/ckan_logo_box.png diff --git a/doc/_static/ckanlogo.png b/doc/_static/ckanlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..a234cc085bb9e9e0fe45df4d8851b43f2e8ed6c1 GIT binary patch literal 1303 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 From 7f1327fe010debaee0eed9a5d3c87c119aede52c Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 7 Nov 2013 13:45:55 +0000 Subject: [PATCH 04/15] [#1068] Show 404 instead of login page on user not found Remove unnecessary auth check, fix redirect --- ckan/controllers/user.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index 1c6fefff344..28f62b85e01 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -68,7 +68,7 @@ def _setup_template_variables(self, context, data_dict): try: user_dict = get_action('user_show')(context, data_dict) except NotFound: - h.redirect_to(controller='user', action='login', id=None) + abort(404, _('User not found')) except NotAuthorized: abort(401, _('Not authorized to see this page')) c.user_dict = user_dict @@ -117,10 +117,6 @@ def read(self, id=None): 'for_view': True} data_dict = {'id': id, 'user_obj': c.userobj} - try: - check_access('user_show', context, data_dict) - except NotAuthorized: - abort(401, _('Not authorized to see this page')) context['with_related'] = True From d0d18a238ae3938e880699df6db2e49ee952ff30 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Mon, 11 Nov 2013 18:38:54 +0100 Subject: [PATCH 05/15] [#1155] Tweak upgrading dependencies docs --- CONTRIBUTING.rst | 64 ++-------------------------------- doc/upgrading-dependencies.rst | 57 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 62 deletions(-) create mode 100644 doc/upgrading-dependencies.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 79bd8f77b5b..b2e324ac204 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -61,6 +61,7 @@ When writing code for CKAN, try to respect our coding standards: css-coding-standards javascript-coding-standards testing-coding-standards + upgrading-dependencies * `CKAN coding standards `_ * `Python coding standards `_ @@ -68,6 +69,7 @@ When writing code for CKAN, try to respect our coding standards: * `CSS coding standards `_ * `JavaScript coding standards `_ * `Testing coding standards `_ +* `Upgrading CKAN's dependencies `_ --------------- @@ -236,65 +238,3 @@ Merging a Pull Request If you're reviewing a pull request for CKAN, when merging a branch into master: - Use the ``--no-ff`` option in the ``git merge`` command, - - --------------------------- -Upgrading the dependencies --------------------------- - -CKAN's dependencies are pinned to specific versions, so we can guarantee that -no matter when you install it, you'll always get the same dependencies' -versions our code was tested with. - -We couldn't simply leave everything in our requirements.txt file, though. -Sometimes, we discover that one dependency releases a new version that's -incompatible with CKAN, so we need a way to enforce that we won't upgrade it -unexpectedly in the future. We also split between dev and non-dev requirements, -so production servers don't need to install dependencies only used for testing, -for example. - -Our dependencies are split in 3 files: ``requirements.in``, -``requirements.txt``, and ``dev-requirements.txt``. - -requirements.in - Contains our direct dependencies (i.e. not our dependencies' dependencies), - with loosely defined versions. For example, ``apachemiddleware>=0.1.1,<0.2``. - -requirements.txt - Contains every dependency, including indirect, pinned to a specific - version. Created with ``pip freeze``. For example, ``simplejson==3.3.1``. - -dev-requirements.txt - Contains our development dependencies, pinned to a specific version. For - example, ``factory-boy==2.1.1``. - -We haven't created a ``dev-requirement.in`` because we have too few dev -dependencies, we don't update them often, and none of them have a known -incompatible version. - -Steps to upgrade -================ - -#. Create a new virtualenv: ``virtualenv --no-site-packages upgrading`` - -#. Install the requirements with unpinned versions: ``pip install -r - requirements.in`` - -#. Save the new dependencies versions: ``pip freeze > requirements.txt``. We - have to do this before installing the other dependencies so we get only what - was in ``requirements.in`` - -#. Install CKAN: ``python setup.py develop`` - -#. Install the development dependencies: ``pip install -r - dev-requirements.txt`` - -#. Run the tests to make sure everything still works (see :doc:`test`). - - - If not, try to fix the problem. If it's too complicated, pinpoint which - dependency's version broke our tests, find an older version that still - works, and add it to ``requirements.in``. Go back to step 1. - -#. Navigate a bit on CKAN to make sure the tests didn't miss anything. Review - the dependencies changes and their changelogs. If everything seems fine, go - ahead and fill a pull request (see :ref:`making a pull request`). diff --git a/doc/upgrading-dependencies.rst b/doc/upgrading-dependencies.rst new file mode 100644 index 00000000000..7fa698cdb68 --- /dev/null +++ b/doc/upgrading-dependencies.rst @@ -0,0 +1,57 @@ +-------------------------- +Upgrading the dependencies +-------------------------- + +The Python modules that CKAN depends on are pinned to specific versions, so we +can guarantee that whenever anyone installs CKAN, they'll always get the same +versions of the Python modules in their virtual environment. + +Our dependencies are defined in three files: + +requirements.in + This file is only used to create a new version of the ``requirements.txt`` + file when upgrading the dependencies. + Contains our direct dependencies only (not dependencies of dependencies) + with loosely defined versions. For example, ``apachemiddleware>=0.1.1,<0.2``. + +requirements.txt + This is the file that people actually use to install CKAN's dependencies into + their virtualenvs. It contains every dependency, including dependencies of + dependencies, each pinned to a specific version. + For example, ``simplejson==3.3.1``. + +dev-requirements.txt + Contains those dependencies only needed by developers, not needed for + production sites. These are pinned to a specific version. For example, + ``factory-boy==2.1.1``. + +We haven't created a ``dev-requirements.in`` file because we have too few dev +dependencies, we don't update them often, and none of them have a known +incompatible version. + +Steps to upgrade +================ + +#. Create a new virtualenv: ``virtualenv --no-site-packages upgrading`` + +#. Install the requirements with unpinned versions: ``pip install -r + requirements.in`` + +#. Save the new dependencies versions: ``pip freeze > requirements.txt``. We + have to do this before installing the other dependencies so we get only what + was in ``requirements.in`` + +#. Install CKAN: ``python setup.py develop`` + +#. Install the development dependencies: ``pip install -r + dev-requirements.txt`` + +#. Run the tests to make sure everything still works (see :doc:`test`). + + - If not, try to fix the problem. If it's too complicated, pinpoint which + dependency's version broke our tests, find an older version that still + works, and add it to ``requirements.in``. Go back to step 1. + +#. Navigate a bit on CKAN to make sure the tests didn't miss anything. Review + the dependencies changes and their changelogs. If everything seems fine, go + ahead and make a pull request (see :ref:`making a pull request`). From 1a188b04f91116beb201eadeb14fe65470e23123 Mon Sep 17 00:00:00 2001 From: Vitor Baptista Date: Mon, 11 Nov 2013 17:19:35 -0300 Subject: [PATCH 06/15] [#1155] Explain how to pin the latest uncompatible version in requirements.in --- doc/upgrading-dependencies.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/upgrading-dependencies.rst b/doc/upgrading-dependencies.rst index 7fa698cdb68..d6c65ca317b 100644 --- a/doc/upgrading-dependencies.rst +++ b/doc/upgrading-dependencies.rst @@ -50,7 +50,9 @@ Steps to upgrade - If not, try to fix the problem. If it's too complicated, pinpoint which dependency's version broke our tests, find an older version that still - works, and add it to ``requirements.in``. Go back to step 1. + works, and add it to ``requirements.in`` (i.e., if ``python-dateutil`` + 2.0.0 broke CKAN, you'd add ``python-dateutil>=1.5.0,<2.0.0``). Go back to + step 1. #. Navigate a bit on CKAN to make sure the tests didn't miss anything. Review the dependencies changes and their changelogs. If everything seems fine, go From 4c05807fa10a946d3f2278e3c85db4290cbbb4bf Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Tue, 12 Nov 2013 15:48:28 +0100 Subject: [PATCH 07/15] [#1155] Add a small clarification to the docs --- doc/upgrading-dependencies.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/upgrading-dependencies.rst b/doc/upgrading-dependencies.rst index d6c65ca317b..6d55201d7fb 100644 --- a/doc/upgrading-dependencies.rst +++ b/doc/upgrading-dependencies.rst @@ -32,6 +32,9 @@ incompatible version. Steps to upgrade ================ +These steps will upgrade all of CKAN's dependencies to the latest versions that +work with CKAN: + #. Create a new virtualenv: ``virtualenv --no-site-packages upgrading`` #. Install the requirements with unpinned versions: ``pip install -r From 7eb2b4faef5d346bb39127dbcf977ce9072c7079 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 13 Nov 2013 15:34:00 +0100 Subject: [PATCH 08/15] [#1294] Show table of contents in docs sidebar on front page --- doc/conf.py | 5 +---- doc/index.rst | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 4a61c0f08e6..320548dbaa0 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -157,10 +157,7 @@ } html_sidebars = { - '**': ['relations.html', 'globaltoc.html'], - # There's no point in showing the table of contents in the sidebar on the - # table of contents page! So: - 'index': ['relations.html'], + '**': ['globaltoc.html'], } # The style sheet to use for HTML and HTML Help pages. A file of that name diff --git a/doc/index.rst b/doc/index.rst index d5be74de521..d03a669d749 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -33,6 +33,7 @@ advanced documentation last: ---- .. toctree:: + :hidden: :maxdepth: 2 installing From 829f3e4607e3d550d27c1997c355cd2c9ac1ef31 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 13 Nov 2013 16:24:51 +0100 Subject: [PATCH 09/15] Remove an unnecessary
from a docs page --- doc/index.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index d03a669d749..e0167318ecb 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -30,8 +30,6 @@ advanced documentation last: covering CKAN's config file options and the differences between CKAN releases. ----- - .. toctree:: :hidden: :maxdepth: 2 From 39ee86d14f9c36a3c8db84d3bee14885298c1dfd Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 13 Nov 2013 17:42:47 +0100 Subject: [PATCH 10/15] Update Sphinx theme --- doc/_themes/sphinx-theme-okfn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn index 59688a6679f..4628f26abf4 160000 --- a/doc/_themes/sphinx-theme-okfn +++ b/doc/_themes/sphinx-theme-okfn @@ -1 +1 @@ -Subproject commit 59688a6679f3373a57e8d4e60e43f1b249878eb3 +Subproject commit 4628f26abf401fdb63ec099384bff44a27dcda4c From 35e5729a2444b748830f136ecae0a52e1358e02a Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Wed, 13 Nov 2013 17:58:49 +0100 Subject: [PATCH 11/15] Fix documentation title --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 320548dbaa0..22e1049600a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -80,7 +80,7 @@ master_doc = 'index' # General information about the project. -project = u'CKAN Documentation' +project = u'CKAN' project_short_name = u'CKAN' copyright = u'''© 2009-2013, Open Knowledge Foundation. Licensed under Date: Fri, 15 Nov 2013 13:51:07 +0000 Subject: [PATCH 12/15] Install extra package needed by Jetty See http://askubuntu.com/questions/377021/solr-jetty-on-ubuntu-12-04-3 --- bin/travis-install-dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies index 50b5ebd22cd..9c699767555 100755 --- a/bin/travis-install-dependencies +++ b/bin/travis-install-dependencies @@ -16,7 +16,7 @@ fi # We need this ppa so we can install postgres-8.4 sudo add-apt-repository -yy ppa:pitti/postgresql sudo apt-get update -qq -sudo apt-get install solr-jetty postgresql-$PGVERSION +sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java:amd64=1.2.2-1 sudo service postgresql reload From 4ed553eb2b09a758d678156de745277a4c42e0c9 Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Fri, 15 Nov 2013 15:04:46 +0100 Subject: [PATCH 13/15] Rename a docs page --- doc/authorization.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/authorization.rst b/doc/authorization.rst index 937a833e29e..900d02e52fb 100644 --- a/doc/authorization.rst +++ b/doc/authorization.rst @@ -1,6 +1,6 @@ -============= -Authorization -============= +=============================== +Organizations and authorization +=============================== .. versionchanged:: 2.0 Previous versions of CKAN used a different authorization system. From c433c0c9b7256a31df7437d7746d8d578cc9db3c Mon Sep 17 00:00:00 2001 From: Sean Hammond Date: Fri, 15 Nov 2013 17:24:21 +0100 Subject: [PATCH 14/15] Fix a Sphinx warning --- doc/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index ec113ea9d4a..fc80fd8ac08 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -1097,7 +1097,7 @@ DataPusher Settings .. _ckan.datapusher.formats: ckan.datapusher.formats -^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^ Example:: ckan.datapusher.formats = csv xls xlsx From 0666cf391065337e6f03ae4ed53642696dd02acc Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 15 Nov 2013 16:45:31 +0000 Subject: [PATCH 15/15] Rebuild main.css --- ckan/public/base/css/main.css | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css index 5e4887a0293..e3069b76c89 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -6126,6 +6126,7 @@ textarea { } .js .image-upload .btn-remove-url .icon-remove { margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -7716,6 +7717,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7733,9 +7737,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7986,6 +8009,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #005d7a url("../../../base/images/bg.png"); }