Merge branch 'release/0.2.0'

Kotaimen · Oct 13, 2015 · 0216e38 · 0216e38
2 parents 28f8eb8 + 08d01d9
commit 0216e38
Show file tree

Hide file tree

Showing 74 changed files with 54 additions and 35 deletions.
diff --git a/CHANGES b/CHANGES
@@ -33,3 +33,13 @@ Feature:
 - Stability and bug fixes
 - Performance turning
 - Docker deployment
+
+
+v0.2.0
+------
+
+Release date: 2015-10-13
+
+- Supports docker-compose and AWS ECS deployment
+- Rearranged unittest sources
+
diff --git a/Dockerfile b/Dockerfile
@@ -1,30 +1,32 @@
-FROM        kotaimen/stonemason-base:0.2.0rc2
+FROM        kotaimen/stonemason-base:0.2.0
 MAINTAINER  Kotaimen <kotaimen.c@gmail.com>
 ENV         DEBIAN_FRONTEND noninteractive
 
-#
-# Set locale, otherwise Click complains, see http://click.pocoo.org/3/python3/
-#
-RUN         locale-gen en_US.UTF-8
-ENV         LANG en_US.UTF-8
-ENV         LANGUAGE en_US:en
-ENV         LC_ALL en_US.UTF-8
-
 #
 # Install stonemason and run tests
 #
-WORKDIR     /tmp/stonemason
+
+WORKDIR     /tmp/stonemason/
 
 ADD         . ./
 
 RUN         pip install -rrequirements-dev.txt && \
             pip install . && \
             python setup.py build_ext -if && \
-            tox -e py27geo && \
-            stonemason init && \
-            stonemason check && \
+            tox -e py27 && \
             rm -rf /tmp/stonemason
 
-ENTRYPOINT  ["stonemason"]
-CMD         ["--help"]
+#
+# Create a sample at /var/lib/stonemason/map_gallery
+#
+WORKDIR     /var/lib/stonemason/
+
+RUN         stonemason init && \
+            stonemason check
 
+#
+# Entry
+#
+EXPOSE      80
+ENTRYPOINT  ["stonemason"]
+CMD         [tileserver", "--bind=0.0.0.0:80"]
diff --git a/Dockerfile-12.04 b/Dockerfile-12.04
@@ -1,3 +1,7 @@
+#
+# For legacy travis environment
+#
+
 FROM        ubuntu:12.04
 MAINTAINER  Kotaimen <kotaimen.c@gmail.com>
 ENV         DEBIAN_FRONTEND noninteractive
@@ -75,6 +79,6 @@ RUN         pip install -rrequirements-dev.txt && \
 # Check installation
 #
 RUN         python setup.py build_ext -if
-RUN         tox -e py27geo
+RUN         tox -e py27
 RUN         stonemason init
 RUN         stonemason -v check
diff --git a/README.md b/README.md
@@ -24,5 +24,4 @@ Features:
 - Image composer based on PIL and imagemagick (done)
 - Zero configuration deployment (done)
 
-> TODO: Add a demo page here.
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 six>=1.8.0
 Flask>=0.10
-Pillow>=2.3.0
+Pillow>=2.3.0,<3.0.0
 pylibmc>=1.4.3
 boto>=2.35.0
 Click>=3.0.0

diff --git a/setup.py b/setup.py
@@ -50,7 +50,7 @@ def find_version(*file_paths):
 install_requires = [
     'six>=1.9.0',
     'Flask>=0.10',
-    'Pillow>=2.3.0',
+    'Pillow>=2.3.0,<3.0.0',
     'boto>=2.35.0',
     'Click>=4.0',
     'gunicorn>=19.0.0',
@@ -87,7 +87,8 @@ def find_version(*file_paths):
 entry_points = '''
 [console_scripts]
 stonemason=stonemason.__main__:cli
-'''
+stonemason%d=stonemason.__main__:cli
+''' % sys.version_info.major
 #
 # Custom commands
 #
@@ -165,7 +166,7 @@ def run(self):
     description='Map tile service toolkit.',
     long_description=long_description,
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'Operating System :: POSIX',
@@ -176,11 +177,10 @@ def run(self):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
     ],
     keywords='map tile mapnik gdal tms',
-    author='The Stonemasons',
+    author='K&R',
     author_email='kotaimen.c@gmail.com, gliese.q@gmail.com',
     url='http://github.com/kotaimen/stonemason',
     license='MIT',

diff --git a/stonemason/__init__.py b/stonemason/__init__.py
@@ -11,7 +11,7 @@
 
 
 # Version used in the setup.py
-__version__ = '0.2.0rc2'
+__version__ = '0.2.0'
 
 # Prevent nosetests peek into this package
 __test__ = False
diff --git a/tests/stonemason/cli/__init__.py → tests/cli/__init__.py b/tests/stonemason/cli/__init__.py → tests/cli/__init__.py
diff --git a/tests/stonemason/cli/test_cli.py → tests/cli/test_cli.py b/tests/stonemason/cli/test_cli.py → tests/cli/test_cli.py
diff --git a/...onemason/cli/test_tilerenderer_command.py → tests/cli/test_tilerenderer_command.py b/...onemason/cli/test_tilerenderer_command.py → tests/cli/test_tilerenderer_command.py
diff --git a/...stonemason/cli/test_tileserver_command.py → tests/cli/test_tileserver_command.py b/...stonemason/cli/test_tileserver_command.py → tests/cli/test_tileserver_command.py
diff --git a/tests/stonemason/formatbundle/__init__.py → tests/formatbundle/__init__.py b/tests/stonemason/formatbundle/__init__.py → tests/formatbundle/__init__.py
diff --git a/tests/stonemason/formatbundle/test_bundle.py → tests/formatbundle/test_bundle.py b/tests/stonemason/formatbundle/test_bundle.py → tests/formatbundle/test_bundle.py
diff --git a/...s/stonemason/formatbundle/test_maptype.py → tests/formatbundle/test_maptype.py b/...s/stonemason/formatbundle/test_maptype.py → tests/formatbundle/test_maptype.py
diff --git a/...tonemason/formatbundle/test_tileformat.py → tests/formatbundle/test_tileformat.py b/...tonemason/formatbundle/test_tileformat.py → tests/formatbundle/test_tileformat.py
diff --git a/tests/stonemason/formatbundle/test_writer.py → tests/formatbundle/test_writer.py b/tests/stonemason/formatbundle/test_writer.py → tests/formatbundle/test_writer.py
diff --git a/tests/stonemason/mason/__init__.py → tests/mason/__init__.py b/tests/stonemason/mason/__init__.py → tests/mason/__init__.py
diff --git a/tests/stonemason/mason/test_builder.py → tests/mason/test_builder.py b/tests/stonemason/mason/test_builder.py → tests/mason/test_builder.py
diff --git a/tests/stonemason/mason/test_mapbook.py → tests/mason/test_mapbook.py b/tests/stonemason/mason/test_mapbook.py → tests/mason/test_mapbook.py
diff --git a/tests/stonemason/mason/test_mapsheet.py → tests/mason/test_mapsheet.py b/tests/stonemason/mason/test_mapsheet.py → tests/mason/test_mapsheet.py
diff --git a/tests/stonemason/mason/test_mason.py → tests/mason/test_mason.py b/tests/stonemason/mason/test_mason.py → tests/mason/test_mason.py
diff --git a/tests/stonemason/mason/test_metadata.py → tests/mason/test_metadata.py b/tests/stonemason/mason/test_metadata.py → tests/mason/test_metadata.py
diff --git a/tests/stonemason/__init__.py → tests/mason/theme/__init__.py b/tests/stonemason/__init__.py → tests/mason/theme/__init__.py
diff --git a/tests/stonemason/mason/theme/test_curator.py → tests/mason/theme/test_curator.py b/tests/stonemason/mason/theme/test_curator.py → tests/mason/theme/test_curator.py
diff --git a/tests/stonemason/mason/theme/test_gallery.py → tests/mason/theme/test_gallery.py b/tests/stonemason/mason/theme/test_gallery.py → tests/mason/theme/test_gallery.py
diff --git a/tests/stonemason/mason/theme/test_theme.py → tests/mason/theme/test_theme.py b/tests/stonemason/mason/theme/test_theme.py → tests/mason/theme/test_theme.py
diff --git a/tests/stonemason/pyramid/__init__.py → tests/pyramid/__init__.py b/tests/stonemason/pyramid/__init__.py → tests/pyramid/__init__.py
diff --git a/tests/stonemason/pyramid/geo/__init__.py → tests/pyramid/geo/__init__.py b/tests/stonemason/pyramid/geo/__init__.py → tests/pyramid/geo/__init__.py
diff --git a/tests/stonemason/pyramid/geo/test_tms.py → tests/pyramid/geo/test_tms.py b/tests/stonemason/pyramid/geo/test_tms.py → tests/pyramid/geo/test_tms.py
diff --git a/tests/stonemason/pyramid/test_hilbert.py → tests/pyramid/test_hilbert.py b/tests/stonemason/pyramid/test_hilbert.py → tests/pyramid/test_hilbert.py
diff --git a/tests/stonemason/pyramid/test_metatile.py → tests/pyramid/test_metatile.py b/tests/stonemason/pyramid/test_metatile.py → tests/pyramid/test_metatile.py
diff --git a/tests/stonemason/pyramid/test_pyramid.py → tests/pyramid/test_pyramid.py b/tests/stonemason/pyramid/test_pyramid.py → tests/pyramid/test_pyramid.py
diff --git a/tests/stonemason/pyramid/test_serial.py → tests/pyramid/test_serial.py b/tests/stonemason/pyramid/test_serial.py → tests/pyramid/test_serial.py
diff --git a/tests/stonemason/pyramid/test_tile.py → tests/pyramid/test_tile.py b/tests/stonemason/pyramid/test_tile.py → tests/pyramid/test_tile.py
diff --git a/tests/stonemason/renderer/__init__.py → tests/renderer/__init__.py b/tests/stonemason/renderer/__init__.py → tests/renderer/__init__.py
diff --git a/...nemason/renderer/cartographer/__init__.py → tests/renderer/cartographer/__init__.py b/...nemason/renderer/cartographer/__init__.py → tests/renderer/cartographer/__init__.py
diff --git a/...n/renderer/cartographer/image/__init__.py → ...s/renderer/cartographer/image/__init__.py b/...n/renderer/cartographer/image/__init__.py → ...s/renderer/cartographer/image/__init__.py
diff --git a/.../cartographer/image/composite/__init__.py → .../cartographer/image/composite/__init__.py b/.../cartographer/image/composite/__init__.py → .../cartographer/image/composite/__init__.py
diff --git a/...apher/image/composite/test_imagemagick.py → ...apher/image/composite/test_imagemagick.py b/...apher/image/composite/test_imagemagick.py → ...apher/image/composite/test_imagemagick.py
diff --git a/...r/cartographer/image/terminal/__init__.py → ...r/cartographer/image/terminal/__init__.py b/...r/cartographer/image/terminal/__init__.py → ...r/cartographer/image/terminal/__init__.py
diff --git a/...rtographer/image/terminal/test_mapnik_.py → ...rtographer/image/terminal/test_mapnik_.py b/...rtographer/image/terminal/test_mapnik_.py → ...rtographer/image/terminal/test_mapnik_.py
diff --git a/...artographer/image/terminal/test_relief.py → ...artographer/image/terminal/test_relief.py b/...artographer/image/terminal/test_relief.py → ...artographer/image/terminal/test_relief.py
diff --git a/...rtographer/image/terminal/test_storage.py → ...rtographer/image/terminal/test_storage.py b/...rtographer/image/terminal/test_storage.py → ...rtographer/image/terminal/test_storage.py
diff --git a/...nderer/cartographer/image/test_factory.py → ...nderer/cartographer/image/test_factory.py b/...nderer/cartographer/image/test_factory.py → ...nderer/cartographer/image/test_factory.py
diff --git a/...nderer/cartographer/image/test_feature.py → ...nderer/cartographer/image/test_feature.py b/...nderer/cartographer/image/test_feature.py → ...nderer/cartographer/image/test_feature.py
diff --git a/.../cartographer/image/transform/__init__.py → .../cartographer/image/transform/__init__.py b/.../cartographer/image/transform/__init__.py → .../cartographer/image/transform/__init__.py
diff --git a/...tonemason/renderer/datasource/__init__.py → tests/renderer/datasource/__init__.py b/...tonemason/renderer/datasource/__init__.py → tests/renderer/datasource/__init__.py
diff --git a/...emason/renderer/datasource/test_raster.py → tests/renderer/datasource/test_raster.py b/...emason/renderer/datasource/test_raster.py → tests/renderer/datasource/test_raster.py
diff --git a/tests/stonemason/renderer/engine/__init__.py → tests/renderer/engine/__init__.py b/tests/stonemason/renderer/engine/__init__.py → tests/renderer/engine/__init__.py
diff --git a/...tonemason/renderer/engine/test_grammar.py → tests/renderer/engine/test_grammar.py b/...tonemason/renderer/engine/test_grammar.py → tests/renderer/engine/test_grammar.py
diff --git a/...emason/renderer/engine/test_rendernode.py → tests/renderer/engine/test_rendernode.py b/...emason/renderer/engine/test_rendernode.py → tests/renderer/engine/test_rendernode.py
diff --git a/tests/stonemason/renderer/test_renderer.py → tests/renderer/test_renderer.py b/tests/stonemason/renderer/test_renderer.py → tests/renderer/test_renderer.py
diff --git a/tests/stonemason/mason/theme/__init__.py → tests/service/__init__.py b/tests/stonemason/mason/theme/__init__.py → tests/service/__init__.py
diff --git a/.../stonemason/service/renderman/__init__.py → tests/service/renderman/__init__.py b/.../stonemason/service/renderman/__init__.py → tests/service/renderman/__init__.py
diff --git a/...onemason/service/renderman/test_walker.py → tests/service/renderman/test_walker.py b/...onemason/service/renderman/test_walker.py → tests/service/renderman/test_walker.py
diff --git a/...stonemason/service/tileserver/__init__.py → tests/service/tileserver/__init__.py b/...stonemason/service/tileserver/__init__.py → tests/service/tileserver/__init__.py
diff --git a/...son/service/tileserver/test_tileserver.py → tests/service/tileserver/test_tileserver.py b/...son/service/tileserver/test_tileserver.py → tests/service/tileserver/test_tileserver.py
@@ -29,13 +29,13 @@ def test_config_from_pyfile(self):
         self.assertRaises(IOError, TileServerApp, 'settings.py')
 
     def test_config_from_env_variables(self):
-        os.environ['STONEMASON_DEBUG'] = 'True'
+        os.environ['STONEMASON_CACHE'] = '127.0.0.1'
         app = TileServerApp()
-        self.assertIn('STONEMASON_DEBUG', app.config)
+        self.assertIn('STONEMASON_CACHE', app.config)
 
     def test_config_from_cmd_varables(self):
-        app = TileServerApp(STONEMASON_DEBUG=True)
-        self.assertIn('STONEMASON_DEBUG', app.config)
+        app = TileServerApp(STONEMASON_CACHE='127.0.0.1')
+        self.assertIn('STONEMASON_CACHE', app.config)
 
 
 @skipUnlessHasGDAL()

diff --git a/tests/stonemason/service/__init__.py b/tests/stonemason/service/__init__.py
diff --git a/tests/stonemason/test_gdal.py → tests/test_gdal.py b/tests/stonemason/test_gdal.py → tests/test_gdal.py
diff --git a/tests/stonemason/test_mapnik.py → tests/test_mapnik.py b/tests/stonemason/test_mapnik.py → tests/test_mapnik.py
diff --git a/tests/stonemason/tilecache/__init__.py → tests/tilecache/__init__.py b/tests/stonemason/tilecache/__init__.py → tests/tilecache/__init__.py
diff --git a/tests/stonemason/tilecache/test_memcache.py → tests/tilecache/test_memcache.py b/tests/stonemason/tilecache/test_memcache.py → tests/tilecache/test_memcache.py
diff --git a/tests/stonemason/tilecache/test_tilecache.py → tests/tilecache/test_tilecache.py b/tests/stonemason/tilecache/test_tilecache.py → tests/tilecache/test_tilecache.py
diff --git a/tests/stonemason/tilestorage/__init__.py → tests/tilestorage/__init__.py b/tests/stonemason/tilestorage/__init__.py → tests/tilestorage/__init__.py
diff --git a/tests/stonemason/tilestorage/test_cluster.py → tests/tilestorage/test_cluster.py b/tests/stonemason/tilestorage/test_cluster.py → tests/tilestorage/test_cluster.py
diff --git a/...tonemason/tilestorage/test_clusterfier.py → tests/tilestorage/test_clusterfier.py b/...tonemason/tilestorage/test_clusterfier.py → tests/tilestorage/test_clusterfier.py
diff --git a/tests/stonemason/tilestorage/test_disk.py → tests/tilestorage/test_disk.py b/tests/stonemason/tilestorage/test_disk.py → tests/tilestorage/test_disk.py
diff --git a/tests/stonemason/tilestorage/test_s3.py → tests/tilestorage/test_s3.py b/tests/stonemason/tilestorage/test_s3.py → tests/tilestorage/test_s3.py
diff --git a/tests/stonemason/util/__init__.py → tests/util/__init__.py b/tests/stonemason/util/__init__.py → tests/util/__init__.py
diff --git a/...tonemason/util/postprocessing/__init__.py → tests/util/postprocessing/__init__.py b/...tonemason/util/postprocessing/__init__.py → tests/util/postprocessing/__init__.py
diff --git a/...ason/util/postprocessing/test_gridcrop.py → tests/util/postprocessing/test_gridcrop.py b/...ason/util/postprocessing/test_gridcrop.py → tests/util/postprocessing/test_gridcrop.py
diff --git a/tests/stonemason/util/test_guesstypes.py → tests/util/test_guesstypes.py b/tests/stonemason/util/test_guesstypes.py → tests/util/test_guesstypes.py
diff --git a/tests/stonemason/util/test_timer.py → tests/util/test_timer.py b/tests/stonemason/util/test_timer.py → tests/util/test_timer.py
diff --git a/tox.ini b/tox.ini
@@ -4,21 +4,26 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py27geo, py34, docs
+envlist = py27, docs
 
-[testenv]
-changedir=tests
+[testenv:py34]
+basepython=python3.4
+;changedir=tests
+sitepackages=True
+whitelist_externals=nosetests3
 commands =
-    nosetests --no-path-adjustment
+    python setup.py build_ext -if
+    nosetests3
 deps =
     -rrequirements-dev.txt
 
-[testenv:py27geo]
+[testenv:py27]
 basepython=python2.7
-changedir=tests
+;changedir=tests
 sitepackages=True
 whitelist_externals=nosetests
 commands =
+    python setup.py build_ext -if
     nosetests
 deps =
     -rrequirements-dev.txt