Merge branch 'release/0.2.4'

naftulikay · Nov 25, 2019 · f3257a0 · f3257a0
2 parents 8d12c36 + 1747350
commit f3257a0
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 355 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,5 @@
 Authors:
- * Naftuli Tzvi Kay <rfkrocktk@gmail.com>
+ * Naftuli Kay <me@naftuli.wtf>
 
 Contributors:
  * Tomas Neme (https://github.com/Lacrymology)

diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -0,0 +1,13 @@
+Copyright © 2019 Naftuli Kay
+
+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
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+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.
diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -0,0 +1,14 @@
+Copyright © 2019 Naftuli Kay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the “Software”), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.mkd b/README.mkd
@@ -5,8 +5,8 @@ territories in Django. Currently, it includes:
 
   * `locality.json`, a fixture with the world's countries and territories (if
     you notice any missing, [open an
-    issue](https://github.com/rfkrocktk/django-locality/issues) or [submit a pull
-    request](https://github.com/rfkrocktk/django-locality/compare/))
+    issue](https://github.com/naftulikay/django-locality/issues) or [submit a pull
+    request](https://github.com/naftulikay/django-locality/compare/))
   * views for getting serialized values (e.g. for use in a form)
   * nifty form fields and widgets
 
@@ -16,14 +16,14 @@ territories in Django. Currently, it includes:
 
 Install from GitHub with pip:
 
-    pip install -e git+https://github.com/rfkrocktk/django-locality.git#egg=django-locality==0.2.2
+    pip install -e git+https://github.com/naftulikay/django-locality.git#egg=django-locality==0.2.4
 
 Then add `locality` to `INSTALLED_APPS` in your Django settings. To load the
 included data, run:
 
     python manage.py loaddata locality
 
-(or whichever equivalent method you use to run "manage.py" commands) 
+(or whichever equivalent method you use to run "manage.py" commands)
 
 The fixture is not installed as `initial_data.json` to give you the option of
 using your own, and to prevent changes being overwritten whenever you run
@@ -35,7 +35,7 @@ List all countries:
 
     >>> from locality.models import Country
     >>> print Country.objects.all()
-    [<Country: Andorra>, <Country: United Arab Emirates>, 
+    [<Country: Andorra>, <Country: United Arab Emirates>,
     <Country: Antigua and Barbuda>, ...]
 
 or list territories by country:
@@ -56,14 +56,14 @@ You can create your own models around countries and territories:
 ## Bugs / TODO
 
 Please report all bugs to the [GitHub issue
-tracker](https://github.com/rfkrocktk/django-locality/issues), and enjoy the
+tracker](https://github.com/naftulikay/django-locality/issues), and enjoy the
 library :-)
 
 Wishlist:
 
   * template tags
-  * translated country names (see 
-    [issue #1](https://github.com/rfkrocktk/django-locality/issues/1))
+  * translated country names (see
+    [issue #1](https://github.com/naftulikay/django-locality/issues/1))
 
 ### MySQL issues
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -13,7 +13,7 @@ eggs = ${buildout:eggs}
 
 [django]
 recipe = djangorecipe
-project = locality 
+project = locality
 settings = settings
 test = locality
-eggs = ${buildout:eggs} 
+eggs = ${buildout:eggs}
diff --git a/setup.py b/setup.py
@@ -3,12 +3,12 @@
 
 setup(
     name="django-locality",
-    version="0.2.3",
-    url='https://github.com/rfkrocktk/django-locality',
-    license='AGPL',
+    version="0.2.4",
+    url='https://github.com/naftulikay/django-locality',
+    license='MIT',
     description='Countries and territories, made usable.',
-    author='Naftuli Tzvi Kay',
-    author_email='rfkrocktk@gmail.com',
+    author='Naftuli Kay',
+    author_email='me@naftuli.wtf',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,