Skip to content

Commit

Permalink
Merge branch 'master' into solr-py-is-dead-long-live-pysolr
Browse files Browse the repository at this point in the history
  • Loading branch information
joetsoi committed Apr 24, 2016
2 parents e9756fd + ae2eaa3 commit fbb557d
Show file tree
Hide file tree
Showing 546 changed files with 37,033 additions and 122,096 deletions.
9 changes: 9 additions & 0 deletions .circleci-matrix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
env:
- SEGMENTS="0123"
- SEGMENTS="4567"
- SEGMENTS="89ab"
- SEGMENTS="cdef"

command:
- mkdir -p $CIRCLE_TEST_REPORTS/nose
- nosetests --ckan --reset-db --with-pylons=test-core.ini --nologcapture --with-coverage --cover-package=ckan --cover-package=ckanext --with-xunit --xunit-file=$CIRCLE_TEST_REPORTS/nose/junit.xml --segments=$SEGMENTS ckan ckanext
3 changes: 0 additions & 3 deletions .coveragerc

This file was deleted.

10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### CKAN Version if known (or site URL)


### Please describe the expected behaviour


### Please describe the actual behaviour


### What steps can be taken to reproduce the issue?
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Fixes #

### Proposed fixes:



### Features:

- [ ] includes tests covering changes
- [ ] includes updated documentation
- [ ] includes user-visible changes
- [ ] includes API changes
- [ ] includes bugfix for possible backport

Please [X] all the boxes above that apply
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
language: python
sudo: required
python:
- "2.6"
- "2.7"
env:
- PGVERSION=9.1
- PGVERSION=8.4
global:
- CKAN_POSTGRES_DB=ckan_test
- CKAN_POSTGRES_USER=ckan_default
- CKAN_POSTGRES_PWD=pass
- CKAN_DATASTORE_POSTGRES_DB=datastore_test
- CKAN_DATASTORE_POSTGRES_WRITE_USER=ckan_default
- CKAN_DATASTORE_POSTGRES_READ_USER=datastore_default
- CKAN_DATASTORE_POSTGRES_READ_PWD=pass
matrix:
- PGVERSION=9.1
- PGVERSION=8.4
matrix:
exclude:
- python: "2.7"
Expand Down
2 changes: 1 addition & 1 deletion .tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[ckan.2-2]
[ckan.2-4]
file_filter = ckan/i18n/<lang>/LC_MESSAGES/ckan.po
source_file = ckan/i18n/ckan.pot
source_lang = en
Expand Down
155 changes: 154 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,63 @@
Changelog
---------

v2.5.0 XXXX-XX-XX
v2.5.2 2016-03-31
=================

Bug fixes:
* Avoid submitting resources to the DataPusher multiple times (#2856)
* Use `resource.url` as raw_resource_url (#2873)
* Fix DomainObject.count() to return count (#2919)
* Prevent unicode/ascii conversion errors in DataStore
* Fix datastore_delete erasing the db when filters is blank (#2885)
* Avoid package_search exception when using use_default_schema (#2848)
* Encode EXPLAIN SQL before sending to datastore
* Use `ckan.site_url` to generate urls of resources (#2592)
* Fixed the url for the organization_item template

v2.5.1 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Note: This version requires a database upgrade

Note: This version does not require a Solr schema upgrade

Major:
* CKAN extension language translations integrated using ITranslations interface (#2461, #2643)
* Speed improvements for displaying a dataset (#2234), home page (#2554), searching (#2382, #2724) and API actions: package_show (#1078) and user_list (#2752).
* An interface to replace the file uploader, allowing integration with other cloud storage providers (IUploader interface) (#2510)

Minor:
* package_purge API action added (#1572)
* revision_list API action now has paging (#1431)
* Official Ubuntu 14.04 LTS support (#1651)
* Require/validate current password before allowing a password change (#1940)
* recline_map_view now recognizes GeoJSON fileds (#2387)
* Timezone setting (#2494)
* Updating a resource via upload now saves the last_modified value in the resource (#2519)
* DataPusher can be customized using the new IDataPusher interface (#2571)
* Exporting and importing users, with their passwords (if sysadmin) (#2647)

Bug fixes:
* Fix to allow uppercase letters in local part of email when sending user invitations (#2415)
* License pick-list changes would cause old values in datasets to be overwritten when edited (#2472)
* Schema was being passed to package_create_default_resource_views (#2484)
* Arabic translation format string issue (#2493)
* Error when deleting organizations (#2512)
* When DataPusher had an error storing a resource in Data Store, the resource data page gave an error (#2518)
* Data preview failed when it comes from a server that gives 403 error from a HEAD request (#2530)
* 'paster views create' failed for non-default dataset types (#2532)
* DataPusher didn't work for TSV files (#2553)
* DataPusher failed sometimes due to 'type mismatch' (#2581)
* IGroupForm wasn't allowing new groups (of type 'group') to use group_form (#2617, #2640)
* group_purge left behind a Member if it has a parent group/org (#2631)
* organization_purge left orphaned datasets still with owner_id (#2632)
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks

Changes and deprecations
------------------------

Expand All @@ -18,6 +72,44 @@ Changes and deprecations

https://github.com/ckan/ckanext-dcat#rdf-dcat-endpoints

* The library used to render markdown has been changed to python-markdown. This
introduces both ``python-markdown`` and ``bleach`` as dependencies, as ``bleach``
is used to clean any HTML provided to the markdown processor.

* This is the last version of CKAN to support Postgresql 8.x, 9.0 and 9.1. The
next minor version of CKAN will require Postgresql 9.2 or later.


v2.5.0 2015-12-17
=================

Cancelled release

v2.4.3 2016-03-31
=================

Bug fixes:
* Use `resource.url` as raw_resource_url (#2873)
* Fix DomainObject.count() to return count (#2919)
* Add offset param to organization_activity (#2640)
* Prevent unicode/ascii conversion errors in DataStore
* Fix datastore_delete erasing the db when filters is blank (#2885)
* Avoid package_search exception when using use_default_schema (#2848)
* resource_edit incorrectly setting action to new instead of edit
* Encode EXPLAIN SQL before sending to datastore
* Use `ckan.site_url` to generate urls of resources (#2592)
* Don't hide actual exception on paster commands

v2.4.2 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks


v2.4.1 2015-09-02
=================
Expand Down Expand Up @@ -120,6 +212,37 @@ Changes and deprecations
* Config option ``site_url`` is now required - CKAN will not abort during
start-up if it is not set. (#1976)

v2.3.3 2015-12-17
=================

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks

v2.3.4 2016-03-31
=================

Bug fixes:
* Use `resource.url` as raw_resource_url (#2873)
* Fix DomainObject.count() to return count (#2919)
* Prevent unicode/ascii conversion errors in DataStore
* Fix datastore_delete erasing the db when filters is blank (#2885)
* Avoid package_search exception when using use_default_schema (#2848)
* resource_edit incorrectly setting action to new instead of edit
* Use `ckan.site_url` to generate urls of resources (#2592)
* Don't hide actual exception on paster commands

v2.3.3 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks


v2.3.2 2015-09-02
=================
Expand Down Expand Up @@ -444,6 +567,16 @@ Troubleshooting:

Also see the previous point for other ``who.ini`` changes.

v2.2.4 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks

v2.2.3 2015-07-22
=================

Expand Down Expand Up @@ -676,6 +809,16 @@ Troubleshooting:
leaving the fields empty. Also make sure to restart running processes like
harvesters after the update to make sure they use the new code base.

v2.1.6 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks

v2.1.5 2015-07-22
=================

Expand Down Expand Up @@ -843,6 +986,16 @@ Known issues:
* Under certain authorization setups the frontend for the groups functionality
may not work as expected (See #1176 #1175).

v2.0.8 2015-12-17
=================

Note: This version requires a requirements upgrade on source installations

Bug fixes:
* Fix Markdown rendering issue
* Return default error page on fanstatic errors
* Prevent authentication when using API callbacks

v2.0.7 2015-07-22
=================

Expand Down
76 changes: 76 additions & 0 deletions CONDUCT.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@

This code of conduct outlines our expectations for participants within the **CKAN** community, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. Anyone who violates this code of conduct may be banned from the community.

Our open source community strives to:

* **Be friendly and patient.**
* **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
* **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
* **Be careful in the words that we choose**: we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable.
* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.

Definitions
----

Harassment includes, but is not limited to:

- Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, race, age, regional discrimination, political or religious affiliation
- Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment
- Deliberate misgendering. This includes deadnaming or persistently using a pronoun that does not correctly reflect a person's gender identity. You must address people by the name they give you when not addressing them by their username or handle
- Physical contact and simulated physical contact (eg, textual descriptions like “*hug*” or “*backrub*”) without consent or after a request to stop
- Threats of violence, both physical and psychological
- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm
- Deliberate intimidation
- Stalking or following
- Harassing photography or recording, including logging online activity for harassment purposes
- Sustained disruption of discussion
- Unwelcome sexual attention, including gratuitous or off-topic sexual images or behaviour
- Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others
- Continued one-on-one communication after requests to cease
- Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect others from intentional abuse
- Publication of non-harassing private communication

Our open source community prioritizes marginalized people’s safety over privileged people’s comfort. We will not act on complaints regarding:

- ‘Reverse’ -isms, including ‘reverse racism,’ ‘reverse sexism,’ and ‘cisphobia’
- Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you”
- Refusal to explain or debate social justice concepts
- Communicating in a ‘tone’ you don’t find congenial
- Criticizing racist, sexist, cissexist, or otherwise oppressive behavior or assumptions


Diversity Statement
----

We encourage everyone to participate and are committed to building a community for all. Although we will fail at times, we seek to treat everyone both as fairly and equally as possible. Whenever a participant has made a mistake, we expect them to take responsibility for it. If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong.

Although this list cannot be exhaustive, we explicitly honor diversity in age, gender, gender identity or expression, culture, ethnicity, language, national origin, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, and technical ability. We will not tolerate discrimination based on any of the protected
characteristics above, including participants with disabilities.

Reporting Issues
----

If you experience or witness unacceptable behavior—or have any other concerns—please report it by contacting us via conduct@ckan.org. All reports will be handled with discretion. In your report please include:

- Your contact information.
- Names (real, nicknames, or pseudonyms) of any individuals involved. If there are additional witnesses, please
include them as well. Your account of what occurred, and if you believe the incident is ongoing. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger), please include a link.
- Any additional information that may be helpful.

After filing a report, a representative will contact you personally, review the incident, follow up with any additional questions, and make a decision as to how to respond. If the person who is harassing you is part of the response team, they will recuse themselves from handling your incident. If the complaint originates from a member of the response team, it will be handled by a different member of the response team. We will respect confidentiality requests for the purpose of protecting victims of abuse.

Attribution & Acknowledgements
----

This document is derived on the `opencodeofconduct <https://github.com/todogroup/opencodeofconduct>`.

We all stand on the shoulders of giants across many open source communities. We'd like to thank the communities and projects that established code of conducts and diversity statements as our inspiration:

* `Django <https://www.djangoproject.com/conduct/reporting/>`
* `Python <https://www.python.org/community/diversity/>`
* `Ubuntu <http://www.ubuntu.com/about/about-ubuntu/conduct>`
* `Contributor Covenant <http://contributor-covenant.org/>`
* `Geek Feminism <http://geekfeminism.org/about/code-of-conduct/>`
* `Citizen Code of Conduct <http://citizencodeofconduct.org/>`

19 changes: 3 additions & 16 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

Expand All @@ -59,19 +59,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Genshi
------

Copyright © 2006-2007 Edgewall Software
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Migrate
-------
Expand Down
Loading

0 comments on commit fbb557d

Please sign in to comment.