Skip to content

Commit

Permalink
Prepare 0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
silentsokolov committed Aug 3, 2016
1 parent d14ba59 commit 8bde1d3
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ python:
- 3.4
- 3.5


install:
- pip install Django${DJANGO_VERSION}

Expand All @@ -18,6 +17,7 @@ env:
- DJANGO_VERSION=">=1.7,<1.8"
- DJANGO_VERSION=">=1.8,<1.9"
- DJANGO_VERSION=">=1.9,<1.10"
- DJANGO_VERSION=">=1.10,<1.11"

matrix:
exclude:
Expand All @@ -27,8 +27,12 @@ matrix:
env: DJANGO_VERSION=">=1.7,<1.8"
- python: 3.3
env: DJANGO_VERSION=">=1.9,<1.10"
- python: 3.3
env: DJANGO_VERSION=">=1.10,<1.11"
- python: 3.2
env: DJANGO_VERSION=">=1.9,<1.10"
- python: 3.2
env: DJANGO_VERSION=">=1.10,<1.11"

branches:
only:
Expand Down
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.2.4 (2016-01-02)
- Django 1.10 support

0.2.3 (2016-01-02)
- More tests
- Remove LatLong as list
Expand Down
6 changes: 6 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
DATABASES={
'default': {'ENGINE': 'django.db.backends.sqlite3'}
},
TEMPLATES=[
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
},
],
TREASURE_MAP={
'BACKEND': 'treasuremap.backends.google.GoogleMapBackend'
},
Expand Down
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
# -*- coding: utf-8 -*-

import os
import re
from setuptools import setup


def get_version(package):
init_py = open(os.path.join(package, '__init__.py')).read()
return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)


def get_packages(package):
return [dirpath for dirpath, dirnames, filenames in os.walk(package)
if os.path.exists(os.path.join(dirpath, '__init__.py'))]
Expand All @@ -24,7 +30,7 @@ def get_package_data(package):

setup(
name='django-treasuremap',
version='0.2.3',
version=get_version('treasuremap'),
url='https://github.com/silentsokolov/django-treasuremap',
license='MIT',
author='Dmitriy Sokolov',
Expand Down
5 changes: 4 additions & 1 deletion treasuremap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@


__author__ = 'Dmitriy Sokolov'
__version__ = '0.2.1'
__version__ = '0.2.4'


default_app_config = 'treasuremap.apps.TreasureMapConfig'


VERSION = __version__
1 change: 1 addition & 0 deletions treasuremap/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def _get_media(self):
class AdminMapWidget(MapWidget):
def get_context_widgets(self):
context = super(AdminMapWidget, self).get_context_widgets()

context['width'] = self.map_backend.admin_width
context['height'] = self.map_backend.admin_height

Expand Down

0 comments on commit 8bde1d3

Please sign in to comment.