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

Setup.py should list dependencies and limit future major version updates #33

Merged
merged 14 commits into from
Mar 20, 2017
Merged
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
2 changes: 1 addition & 1 deletion ckanext/archiver/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def create_archiver_package_task(package, queue):


def get_extra_from_pkg_dict(pkg_dict, key, default=None):
for extra in pkg_dict['extras']:
for extra in pkg_dict.get('extras', []):
if extra['key'] == key:
return extra['value']
return default
13 changes: 7 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
celery==2.4.2
kombu==2.1.3
kombu-sqlalchemy==1.1.0
SQLAlchemy>=0.6.6
requests>=1.1.0
progressbar
celery~=2.4.2
kombu~=2.5
progressbar~=2.3
requests~=2.3.0
SQLAlchemy~=0.9.6
-e [email protected]:datagovuk/ckanext-report#egg=ckanext-report
-e .
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),

install_requires=[
# Requirements defined in requirements.txt
'celery>=2.4.2',
'kombu>=2.5.15',
'SQLAlchemy>=0.9',
'requests>=2.3',
'progressbar>=2.3',
'ckanext-report>=0.1'
],

# If there are data files included in your packages that need to be
Expand Down