Merge branch 'develop'

Author: tOgg1

.gitignore

@@ -61,3 +61,4 @@ target/
 # Virtualenv
 venv
 
+.idea

.travis.yml

@@ -2,7 +2,7 @@
 deploy:
   true:
     condition: $TOXENV == py27
-    repo: Typecraft/tc_xml_python
+    repo: Typecraft/typecraft_python
     tags: true
   distributions: sdist bdist_wheel
   password:

CONTRIBUTING.rst

@@ -15,7 +15,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://github.com/Typecraft/tc_xml_python/issues.
+Report bugs at https://github.com/Typecraft/typecraft_python/issues.
 
 If you are reporting a bug, please include:
 
@@ -45,7 +45,7 @@ articles, and such.
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at https://github.com/Typecraft/tc_xml_python/issues.
+The best way to send feedback is to file an issue at https://github.com/Typecraft/typecraft_python/issues.
 
 If you are proposing a feature:
 
@@ -57,17 +57,17 @@ If you are proposing a feature:
 Get Started!
 ------------
 
-Ready to contribute? Here's how to set up `tc_xml_python` for local development.
+Ready to contribute? Here's how to set up `typecraft_python` for local development.
 
-1. Fork the `tc_xml_python` repo on GitHub.
+1. Fork the `typecraft_python` repo on GitHub.
 2. Clone your fork locally::
 
-    $ git clone git@github.com:your_name_here/tc_xml_python.git
+    $ git clone git@github.com:your_name_here/typecraft_python.git
 
 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
 
-    $ mkvirtualenv tc_xml_python
-    $ cd tc_xml_python/
+    $ mkvirtualenv typecraft_python
+    $ cd typecraft_python/
     $ python setup.py develop
 
 4. Create a branch for local development::
@@ -78,7 +78,7 @@ Ready to contribute? Here's how to set up `tc_xml_python` for local development.
 
 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
 
-    $ flake8 tc_xml_python tests
+    $ flake8 typecraft_python tests
     $ python setup.py test or py.test
     $ tox
 
@@ -102,13 +102,13 @@ Before you submit a pull request, check that it meets these guidelines:
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
 3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
-   https://travis-ci.org/Typecraft/tc_xml_python/pull_requests
+   https://travis-ci.org/Typecraft/typecraft_python/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
 Tips
 ----
 
 To run a subset of tests::
 
-$ py.test tests.test_tc_xml_python
+$ py.test tests.test_typecraft_python
 

README.rst

@@ -1,33 +1,33 @@
 ===============================
-Typecraft XML Python
+Typecraft Python
 ===============================
 
 
-.. image:: https://img.shields.io/pypi/v/tc_xml_python.svg
-        :target: https://pypi.python.org/pypi/tc_xml_python
+.. image:: https://img.shields.io/pypi/v/typecraft_python.svg
+        :target: https://pypi.python.org/pypi/typecraft_python
 
-.. image:: https://img.shields.io/travis/Typecraft/tc_xml_python.svg
-        :target: https://travis-ci.org/Typecraft/tc_xml_python
+.. image:: https://img.shields.io/travis/Typecraft/typecraft_python.svg
+        :target: https://travis-ci.org/Typecraft/typecraft_python
 
-.. image:: https://readthedocs.org/projects/tc-xml-python/badge/?version=latest
-        :target: https://tc-xml-python.readthedocs.io/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/typecraft_python/badge/?version=latest
+        :target: https://typecraft_python.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
-.. image:: https://pyup.io/repos/github/Typecraft/tc_xml_python/shield.svg
-     :target: https://pyup.io/repos/github/Typecraft/tc_xml_python/
+.. image:: https://pyup.io/repos/github/Typecraft/typecraft_python/shield.svg
+     :target: https://pyup.io/repos/github/Typecraft/typecraft_python/
      :alt: Updates
 
 
 Lightweight implementation of the Typecraft XML format in python.
 
 
 * Free software: MIT license
-* Documentation: https://tc-xml-python.readthedocs.io.
+* Documentation: https://typecraft_python.readthedocs.io.
 
 Installation
 --------
 
-    pip install tc_xml_python
+    pip install typecraft_python
 
 
 Features

docs/conf.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# tc_xml_python documentation build configuration file, created by
+# typecraft_python documentation build configuration file, created by
 # sphinx-quickstart on Tue Jul  9 22:26:36 2013.
 #
 # This file is execfile()d with the current directory set to its
@@ -31,7 +31,7 @@
 # version is used.
 sys.path.insert(0, project_root)
 
-import tc_xml_python
+import typecraft_python
 
 # -- General configuration ---------------------------------------------
 
@@ -63,9 +63,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = tc_xml_python.__version__
+version = typecraft_python.__version__
 # The full version, including alpha/beta/rc tags.
-release = tc_xml_python.__version__
+release = typecraft_python.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -208,7 +208,7 @@
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'tc_xml_python.tex',
+    ('index', 'typecraft_python.tex',
      u'Typecraft XML Python Documentation',
      u'Tormod Haugland', 'manual'),
 ]
@@ -239,7 +239,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'tc_xml_python',
+    ('index', 'typecraft_python',
      u'Typecraft XML Python Documentation',
      [u'Tormod Haugland'], 1)
 ]
@@ -254,10 +254,10 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'tc_xml_python',
+    ('index', 'typecraft_python',
      u'Typecraft XML Python Documentation',
      u'Tormod Haugland',
-     'tc_xml_python',
+     'typecraft_python',
      'One line description of project.',
      'Miscellaneous'),
 ]

setup.cfg

@@ -1,13 +1,13 @@
 [bumpversion]
-current_version = 0.3.1
+current_version = 0.3.2
 commit = True
 tag = True
 
 [bumpversion:file:setup.py]
 search = version='{current_version}'
 replace = version='{new_version}'
 
-[bumpversion:file:tc_xml_python/__init__.py]
+[bumpversion:file:typecraft_python/__init__.py]
 search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 

setup.py

@@ -10,35 +10,27 @@
     history = history_file.read()
 
 requirements = [
-    'Click>=6.0',
-    # TODO: put package requirements here
 ]
 
 test_requirements = [
-    # TODO: put package test requirements here
 ]
 
 setup(
-    name='tc_xml_python',
-    version='0.3.1',
+    name='typecraft_python',
+    version='0.3.2',
     description="Lightweight implementation of the Typecraft XML format in python.",
     long_description=readme + '\n\n' + history,
     author="Tormod Haugland",
     author_email='tormod.haugland@gmail.com',
-    url='https://github.com/Typecraft/tc_xml_python',
+    url='https://github.com/Typecraft/typecraft_python',
     packages=find_packages(),
-    package_dir={'tc_xml_python':
-                 'tc_xml_python'},
-    entry_points={
-        'console_scripts': [
-            'tc_xml_python=tc_xml_python.cli:main'
-        ]
-    },
+    package_dir={'typecraft_python':
+                 'typecraft_python'},
     include_package_data=True,
     install_requires=requirements,
     license="MIT license",
     zip_safe=False,
-    keywords='tc_xml_python',
+    keywords='typecraft_python',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',

tc_xml_python/cli.py

@@ -1,4 +1,4 @@
-import tc_xml_python
+import typecraft_python
 
 
 class TestBasic(object):
@@ -7,6 +7,6 @@ def setup_class(cls):
         pass
 
     def test_variables_exist(self):
-        assert tc_xml_python.__author__ is not None
-        assert tc_xml_python.__email__ is not None
-        assert tc_xml_python.__version__ is not None
+        assert typecraft_python.__author__ is not None
+        assert typecraft_python.__email__ is not None
+        assert typecraft_python.__version__ is not None

tests/test_basic.py

@@ -1,4 +1,4 @@
-from tc_xml_python.models import Text, Phrase, Word, Morpheme
+from typecraft_python.models import Text, Phrase, Word, Morpheme
 
 
 class TestModels(object):