Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to CKAN 2.9.4 & python 3.7 #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ckanext/datarequests/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
import ckan.lib.base as base
import ckan.model as model
import ckan.plugins as plugins
import constants
from . import constants
import datetime
import cgi
import db
from . import db
import logging
import validator
from . import validator
import ckan.lib.mailer as mailer

from pylons import config
from ckan.plugins.toolkit import config

c = plugins.toolkit.c
log = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion ckanext/datarequests/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.

import constants
from . import constants
from ckan.plugins import toolkit as tk


Expand Down
2 changes: 1 addition & 1 deletion ckanext/datarequests/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.

import constants
from . import constants
import sqlalchemy as sa
import uuid

Expand Down
2 changes: 1 addition & 1 deletion ckanext/datarequests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import ckan.model as model
import ckan.plugins.toolkit as tk
import db
from . import db

from ckan.common import c

Expand Down
10 changes: 5 additions & 5 deletions ckanext/datarequests/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
import ckan.lib.helpers as h
import ckan.plugins as p
import ckan.plugins.toolkit as tk
import auth
import actions
import constants
import helpers
from . import auth
from . import actions
from . import constants
from . import helpers
import os
import sys

from functools import partial
from pylons import config
from ckan.plugins.toolkit import config


def get_config_bool_value(config_name, default_value=False):
Expand Down
2 changes: 1 addition & 1 deletion ckanext/datarequests/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.

import constants
from . import constants
import ckan.plugins.toolkit as tk
import ckanext.datarequests.db as db

Expand Down