Merge pull request #4 from Pike/prepare-pypi, r=gandalf

Merging with an r=gandalf.

https://bugzilla.mozilla.org/show_bug.cgi?id=1284846#c9

.gitignore

@@ -1 +1,4 @@
+l20n.egg-info/
+build/
+dist/
 *.pyc

LICENSE

@@ -1,25 +1,13 @@
-Copyright (c) 2011, Mozilla Foundation
-All rights reserved.
+Copyright 2016 Mozilla Foundation
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of the copyright owner nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.rst

@@ -0,0 +1,7 @@
+L20n
+====
+
+Python library to support parsing and serializing files for localiztion
+through the l20n localization infrastructure.
+
+Learn more about l20n on https://l20n.org.

setup.cfg

@@ -0,0 +1,4 @@
+[bdist_wheel]
+# This flag says that the code is written to work on both Python 2 and Python
+# 3.
+universal=1

setup.py

@@ -1,14 +1,23 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 setup(name='l20n',
-      version='0.2',
+      version='4.0.0a1',
       description='Python L20n library',
-      author='Mozilla',
-      author_email='[email protected]',
+      author='Zibi Braniecki',
+      author_email='[email protected]',
+      license='APL 2',
       url='https://github.com/l20n/python-l20n',
-      packages=['ftl', 'ftl.format'],
+      classifiers=[
+            'Development Status :: 3 - Alpha',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: Apache Software License',
+            'Programming Language :: Python :: 2.6',
+            'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3.5',
+      ],
+      packages=['l20n', 'l20n.format'],
       install_requires=[
           'six'
       ]

tests/test_format.py

@@ -4,8 +4,8 @@
 import json
 from six import with_metaclass
 
-from ftl.format.parser import FTLParser
-from ftl.format.serializer import FTLSerializer
+from l20n.format.parser import FTLParser
+from l20n.format.serializer import FTLSerializer
 
 fixtures = os.path.join(
     os.path.dirname(__file__),