Merge branch '186_refactor_routes'

* 186_refactor_routes:
  Update version info
  Update Changelog
  refactor routes refs #186

CHANGES.rst

@@ -1,17 +1,22 @@
+0.4.4 (??-05-2015)
+------------------
+
+- Minor refactoring. Move the pyramid routes to a new file.
+
 0.4.3 (11-03-2015)
 ------------------
 
-We had some packaging issues with the `0.4.2` release. 
+We had some packaging issues with the `0.4.2` release.
 
 
 0.4.2 (11-03-2015)
 ------------------
 
-This release of Atramhasis is mostly a bugfix update of the `0.4.1` release. 
+This release of Atramhasis is mostly a bugfix update of the `0.4.1` release.
 
 - Fix paths of db in scaffolds
-- Add more information on exceptions 
-- Update skosprovider_getty and skosprovider_heritagedata 
+- Add more information on exceptions
+- Update skosprovider_getty and skosprovider_heritagedata
   (fix the problems when importing external thesauri)
 - Documentation update
 
@@ -59,39 +64,39 @@ Upgrading from `0.4.0` should be simple and cause no or few problems.
 ------------------
 
 - Update to skosprovider_ 0.5.0. Among other things, this makes it possible
-  to handle relations between Concepts and Collections using the 
+  to handle relations between Concepts and Collections using the
   *subordinate_arrays* and *superordinates* properties. Conceptschemes are
-  now also much better integrated within the providers, thus making it 
-  possible to provider more context for a Concept. This version of 
+  now also much better integrated within the providers, thus making it
+  possible to provider more context for a Concept. This version of
   skosprovider_ can also handle *skos:matches*.
 - Add possibility to edit language tags. It's now possible to use the admin
-  interface to add, edit and delete languages in Atramhasis. 
-- When the REST service receives labels or notes in currently unavailable 
-  languages, it will validate those through language_tags_. It the languages 
-  are valid according to the IANA registry, they will be added to the languages 
+  interface to add, edit and delete languages in Atramhasis.
+- When the REST service receives labels or notes in currently unavailable
+  languages, it will validate those through language_tags_. It the languages
+  are valid according to the IANA registry, they will be added to the languages
   available in the application.
 - Default length of language id changed to 64 characters. This is not available
   as an alembic migration. So only effective when creating a new database.
   If you already have a database created from an older version of Atramhasis,
   please modify accordingly. Modifying column length on SQLite is not possible
   (see http://www.sqlite.org/omitted.html ).
-- Abiltity to match Concepts in an Atramhasis ConceptScheme to Concepts in 
+- Abiltity to match Concepts in an Atramhasis ConceptScheme to Concepts in
   external ConceptSchemes through properties such as *skos:exactMatch* and
   *skos:closeMatch*.
-- Ability to import Concepts and Collections from external providers. This 
+- Ability to import Concepts and Collections from external providers. This
   makes it possible to import Concepts from eg. the AAT (via skosprovider_getty_),
   Flanders Heritage Thesauri (via skosprovider_oe_),
-  English Heritage Thesauri (via skosprovider_heritagedata_) or any other 
-  SKOS vocabulary for which a skosprovider_ has been written. Currently only 
-  the concept or collection itself can be imported, without its relations to 
+  English Heritage Thesauri (via skosprovider_heritagedata_) or any other
+  SKOS vocabulary for which a skosprovider_ has been written. Currently only
+  the concept or collection itself can be imported, without its relations to
   other concepts or collections.
-- Add the ability to have a delete of a concept or collection fail if it is 
+- Add the ability to have a delete of a concept or collection fail if it is
   being used in other systems.
 - Implement a delete permission.
 - Add validation rule that a Concept must have at least one label.
 - Update to skosprovider_sqlalchemy_ 0.4.1.
 - Update to pyramid_skosprovider_ 0.5.0.
-- Update to skosprovider_rdf_ 0.3.0. This update adds support for dumping 
+- Update to skosprovider_rdf_ 0.3.0. This update adds support for dumping
   ConceptScheme in an RDF file and also handles *subordinate_arrays* and
   *superordinates*.
 - Update to language_tags_ 0.3.0.
@@ -112,14 +117,14 @@ Upgrading from `0.4.0` should be simple and cause no or few problems.
 ------------------
 
 - Atramhasis now includes a working admin userinterface at `/admin`. Still needs
-  some polish when it comes to error handling and reporting about validation 
+  some polish when it comes to error handling and reporting about validation
   errors.
 - The admin module gets run through a dojo build to minimize page loads
   and download times
 - Added RDF/XML en RDF/Turtle downloads to the public interface. Currently
   only dumps a full conceptscheme, not individual concepts.
 - Added more docs.
-  
+
 
 0.2.0 (16-05-2014)
 ------------------

docs/source/conf.py

@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.4.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -82,7 +82,7 @@ def run(self):
 ]
 
 setup(name='atramhasis',
-      version='0.4.3',
+      version='0.4.4.dev0',
       description='A web based editor for thesauri adhering to the SKOS specification.',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[