From abf535d21fd19b257e5d6fecfd60e470cc12de7f Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 15 Feb 2017 16:58:06 +0100 Subject: [PATCH 1/1] rebranding --- .travis.yml | 2 +- MANIFEST.in | 6 +++--- doc/conf.py | 6 +++--- .../__init__.py | 4 ++-- .../locale/de/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.po | 0 .../locale/fi/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.po | 0 .../locale/nn/LC_MESSAGES/django.po | 0 .../locale/no/LC_MESSAGES/django.po | 0 .../locale/pl/LC_MESSAGES/django.po | 0 .../locale/pt/LC_MESSAGES/django.po | 0 .../locale/pt_BR/LC_MESSAGES/django.po | 0 .../locale/ru/LC_MESSAGES/django.po | 0 .../locale/tr/LC_MESSAGES/django.po | 0 .../middleware.py | 0 .../models.py | 0 .../paginator.py | 0 .../settings.py | 0 .../templates/pagination/pagination.html | 0 .../templatetags/__init__.py | 0 .../templatetags/pagination_tags.py | 2 +- .../test_project/__init__.py | 0 .../test_project/example/__init__.py | 0 .../test_project/example/models.py | 0 .../test_project/example/templates/example/list.html | 0 .../example/templates/example/two_lists.html | 0 .../templates/pagination/custom_pagination.html | 0 .../test_project/example/urls.py | 0 .../test_project/example/views.py | 0 .../test_project/manage.py | 2 +- .../test_project/settings.py | 6 +++--- .../test_project/tests.py | 2 +- .../test_project/urls.py | 0 .../tests/__init__.py | 0 .../tests/runner.py | 4 ++-- .../tests/settings.py | 2 +- .../tests/test_main.py | 10 +++++----- setup.py | 12 ++++++------ 40 files changed, 29 insertions(+), 29 deletions(-) rename {linaro_django_pagination => fnp_django_pagination}/__init__.py (93%) rename {linaro_django_pagination => fnp_django_pagination}/locale/de/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/es/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/fi/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/fr/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/it/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/nn/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/no/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/pl/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/pt/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/pt_BR/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/ru/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/locale/tr/LC_MESSAGES/django.po (100%) rename {linaro_django_pagination => fnp_django_pagination}/middleware.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/models.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/paginator.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/settings.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/templates/pagination/pagination.html (100%) rename {linaro_django_pagination => fnp_django_pagination}/templatetags/__init__.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/templatetags/pagination_tags.py (99%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/__init__.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/__init__.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/models.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/templates/example/list.html (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/templates/example/two_lists.html (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/templates/pagination/custom_pagination.html (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/urls.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/example/views.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/manage.py (96%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/settings.py (92%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/tests.py (96%) rename {linaro_django_pagination => fnp_django_pagination}/test_project/urls.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/tests/__init__.py (100%) rename {linaro_django_pagination => fnp_django_pagination}/tests/runner.py (66%) rename {linaro_django_pagination => fnp_django_pagination}/tests/settings.py (83%) rename {linaro_django_pagination => fnp_django_pagination}/tests/test_main.py (97%) diff --git a/.travis.yml b/.travis.yml index 4d555f6..6f9a195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - pip install 'coverage<4' # coverage>=4 has issues with python3 - pip install -q Django==$DJANGO_VERSION coveralls - python setup.py egg_info -script: coverage run --source='linaro_django_pagination' --omit *runner*,*test_project* setup.py test +script: coverage run --source='fnp_django_pagination' --omit *runner*,*test_project* setup.py test after_success: - coveralls matrix: diff --git a/MANIFEST.in b/MANIFEST.in index 50282fe..d8d3609 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,6 @@ include CONTRIBUTORS.txt include COPYING include doc/conf.py recursive-include doc *.rst -recursive-include linaro_django_pagination/locale *.po -recursive-include linaro_django_pagination/templates/pagination *.html -recursive-include linaro_django_pagination/test_project/example/templates *.html +recursive-include fnp_django_pagination/locale *.po +recursive-include fnp_django_pagination/templates/pagination *.html +recursive-include fnp_django_pagination/test_project/example/templates *.html diff --git a/doc/conf.py b/doc/conf.py index 39a80cb..54900bc 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -47,10 +47,10 @@ copyright = u'2010-2011, Linaro Limited' # # The short X.Y version. import versiontools -import linaro_django_pagination -version = "%d.%d" % linaro_django_pagination.__version__[0:2] +import fnp_django_pagination +version = "%d.%d" % fnp_django_pagination.__version__[0:2] # The full version, including alpha/beta/rc tags. -release = versiontools.format_version(linaro_django_pagination.__version__) +release = versiontools.format_version(fnp_django_pagination.__version__) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/linaro_django_pagination/__init__.py b/fnp_django_pagination/__init__.py similarity index 93% rename from linaro_django_pagination/__init__.py rename to fnp_django_pagination/__init__.py index 2425681..f3ce53d 100644 --- a/linaro_django_pagination/__init__.py +++ b/fnp_django_pagination/__init__.py @@ -29,9 +29,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. """ -linaro-django-pagination is a set of utilities for creating robust pagination +fnp-django-pagination is a set of utilities for creating robust pagination tools throughout a django application. """ -__version__ = (2, 0, 2, "final", 0) +__version__ = (2, 2, 0, "final", 0) diff --git a/linaro_django_pagination/locale/de/LC_MESSAGES/django.po b/fnp_django_pagination/locale/de/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/de/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/de/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/es/LC_MESSAGES/django.po b/fnp_django_pagination/locale/es/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/es/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/es/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/fi/LC_MESSAGES/django.po b/fnp_django_pagination/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/fi/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/fi/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/fr/LC_MESSAGES/django.po b/fnp_django_pagination/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/fr/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/fr/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/it/LC_MESSAGES/django.po b/fnp_django_pagination/locale/it/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/it/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/it/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/nn/LC_MESSAGES/django.po b/fnp_django_pagination/locale/nn/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/nn/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/nn/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/no/LC_MESSAGES/django.po b/fnp_django_pagination/locale/no/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/no/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/no/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/pl/LC_MESSAGES/django.po b/fnp_django_pagination/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/pl/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/pl/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/pt/LC_MESSAGES/django.po b/fnp_django_pagination/locale/pt/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/pt/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/pt/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/pt_BR/LC_MESSAGES/django.po b/fnp_django_pagination/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/pt_BR/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/pt_BR/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/ru/LC_MESSAGES/django.po b/fnp_django_pagination/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/ru/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/ru/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/locale/tr/LC_MESSAGES/django.po b/fnp_django_pagination/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from linaro_django_pagination/locale/tr/LC_MESSAGES/django.po rename to fnp_django_pagination/locale/tr/LC_MESSAGES/django.po diff --git a/linaro_django_pagination/middleware.py b/fnp_django_pagination/middleware.py similarity index 100% rename from linaro_django_pagination/middleware.py rename to fnp_django_pagination/middleware.py diff --git a/linaro_django_pagination/models.py b/fnp_django_pagination/models.py similarity index 100% rename from linaro_django_pagination/models.py rename to fnp_django_pagination/models.py diff --git a/linaro_django_pagination/paginator.py b/fnp_django_pagination/paginator.py similarity index 100% rename from linaro_django_pagination/paginator.py rename to fnp_django_pagination/paginator.py diff --git a/linaro_django_pagination/settings.py b/fnp_django_pagination/settings.py similarity index 100% rename from linaro_django_pagination/settings.py rename to fnp_django_pagination/settings.py diff --git a/linaro_django_pagination/templates/pagination/pagination.html b/fnp_django_pagination/templates/pagination/pagination.html similarity index 100% rename from linaro_django_pagination/templates/pagination/pagination.html rename to fnp_django_pagination/templates/pagination/pagination.html diff --git a/linaro_django_pagination/templatetags/__init__.py b/fnp_django_pagination/templatetags/__init__.py similarity index 100% rename from linaro_django_pagination/templatetags/__init__.py rename to fnp_django_pagination/templatetags/__init__.py diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/fnp_django_pagination/templatetags/pagination_tags.py similarity index 99% rename from linaro_django_pagination/templatetags/pagination_tags.py rename to fnp_django_pagination/templatetags/pagination_tags.py index f106942..7d41052 100644 --- a/linaro_django_pagination/templatetags/pagination_tags.py +++ b/fnp_django_pagination/templatetags/pagination_tags.py @@ -51,7 +51,7 @@ from django.template.loader import select_template from django.utils.text import unescape_string_literal # TODO, import this normally later on -from linaro_django_pagination.settings import * +from fnp_django_pagination.settings import * def do_autopaginate(parser, token): diff --git a/linaro_django_pagination/test_project/__init__.py b/fnp_django_pagination/test_project/__init__.py similarity index 100% rename from linaro_django_pagination/test_project/__init__.py rename to fnp_django_pagination/test_project/__init__.py diff --git a/linaro_django_pagination/test_project/example/__init__.py b/fnp_django_pagination/test_project/example/__init__.py similarity index 100% rename from linaro_django_pagination/test_project/example/__init__.py rename to fnp_django_pagination/test_project/example/__init__.py diff --git a/linaro_django_pagination/test_project/example/models.py b/fnp_django_pagination/test_project/example/models.py similarity index 100% rename from linaro_django_pagination/test_project/example/models.py rename to fnp_django_pagination/test_project/example/models.py diff --git a/linaro_django_pagination/test_project/example/templates/example/list.html b/fnp_django_pagination/test_project/example/templates/example/list.html similarity index 100% rename from linaro_django_pagination/test_project/example/templates/example/list.html rename to fnp_django_pagination/test_project/example/templates/example/list.html diff --git a/linaro_django_pagination/test_project/example/templates/example/two_lists.html b/fnp_django_pagination/test_project/example/templates/example/two_lists.html similarity index 100% rename from linaro_django_pagination/test_project/example/templates/example/two_lists.html rename to fnp_django_pagination/test_project/example/templates/example/two_lists.html diff --git a/linaro_django_pagination/test_project/example/templates/pagination/custom_pagination.html b/fnp_django_pagination/test_project/example/templates/pagination/custom_pagination.html similarity index 100% rename from linaro_django_pagination/test_project/example/templates/pagination/custom_pagination.html rename to fnp_django_pagination/test_project/example/templates/pagination/custom_pagination.html diff --git a/linaro_django_pagination/test_project/example/urls.py b/fnp_django_pagination/test_project/example/urls.py similarity index 100% rename from linaro_django_pagination/test_project/example/urls.py rename to fnp_django_pagination/test_project/example/urls.py diff --git a/linaro_django_pagination/test_project/example/views.py b/fnp_django_pagination/test_project/example/views.py similarity index 100% rename from linaro_django_pagination/test_project/example/views.py rename to fnp_django_pagination/test_project/example/views.py diff --git a/linaro_django_pagination/test_project/manage.py b/fnp_django_pagination/test_project/manage.py similarity index 96% rename from linaro_django_pagination/test_project/manage.py rename to fnp_django_pagination/test_project/manage.py index cabc3de..bfb13d7 100755 --- a/linaro_django_pagination/test_project/manage.py +++ b/fnp_django_pagination/test_project/manage.py @@ -34,7 +34,7 @@ import logging from django.core.management import execute_manager try: - from linaro_django_pagination.test_project import settings + from fnp_django_pagination.test_project import settings except ImportError as ex: logging.exception("Unable to import application settings") raise SystemExit(ex) diff --git a/linaro_django_pagination/test_project/settings.py b/fnp_django_pagination/test_project/settings.py similarity index 92% rename from linaro_django_pagination/test_project/settings.py rename to fnp_django_pagination/test_project/settings.py index cf7ea25..7791775 100644 --- a/linaro_django_pagination/test_project/settings.py +++ b/fnp_django_pagination/test_project/settings.py @@ -42,13 +42,13 @@ locals().update( gen_settings( INSTALLED_APPS=[ 'example', - 'linaro_django_pagination'], + 'fnp_django_pagination'], MIDDLEWARE_CLASSES=[ - 'linaro_django_pagination.middleware.PaginationMiddleware'], + 'fnp_django_pagination.middleware.PaginationMiddleware'], TEMPLATE_CONTEXT_PROCESSORS=[ # Request processor needs to be enabled 'django.core.context_processors.request'], - ROOT_URLCONF="linaro_django_pagination.test_project.urls"), + ROOT_URLCONF="fnp_django_pagination.test_project.urls"), TEMPLATE_LOADERS = ['django.template.loaders.app_directories.Loader'], SECRET_KEY = 'not for production', ) diff --git a/linaro_django_pagination/test_project/tests.py b/fnp_django_pagination/test_project/tests.py similarity index 96% rename from linaro_django_pagination/test_project/tests.py rename to fnp_django_pagination/test_project/tests.py index 97e7e5d..02ba73b 100644 --- a/linaro_django_pagination/test_project/tests.py +++ b/fnp_django_pagination/test_project/tests.py @@ -30,7 +30,7 @@ def run_tests(): from django_testproject.tests import run_tests_for - run_tests_for("linaro_django_pagination.test_project.settings") + run_tests_for("fnp_django_pagination.test_project.settings") if __name__ == '__main__': diff --git a/linaro_django_pagination/test_project/urls.py b/fnp_django_pagination/test_project/urls.py similarity index 100% rename from linaro_django_pagination/test_project/urls.py rename to fnp_django_pagination/test_project/urls.py diff --git a/linaro_django_pagination/tests/__init__.py b/fnp_django_pagination/tests/__init__.py similarity index 100% rename from linaro_django_pagination/tests/__init__.py rename to fnp_django_pagination/tests/__init__.py diff --git a/linaro_django_pagination/tests/runner.py b/fnp_django_pagination/tests/runner.py similarity index 66% rename from linaro_django_pagination/tests/runner.py rename to fnp_django_pagination/tests/runner.py index 8ef3ab9..843a5a5 100755 --- a/linaro_django_pagination/tests/runner.py +++ b/fnp_django_pagination/tests/runner.py @@ -8,14 +8,14 @@ from django.core.management import call_command def runtests(): - os.environ['DJANGO_SETTINGS_MODULE'] = 'linaro_django_pagination.tests.settings' + os.environ['DJANGO_SETTINGS_MODULE'] = 'fnp_django_pagination.tests.settings' try: django.setup() except AttributeError: # for Django 1.6 compatible pass - failures = call_command('test', 'linaro_django_pagination') + failures = call_command('test', 'fnp_django_pagination') sys.exit(bool(failures)) if __name__ == '__main__': diff --git a/linaro_django_pagination/tests/settings.py b/fnp_django_pagination/tests/settings.py similarity index 83% rename from linaro_django_pagination/tests/settings.py rename to fnp_django_pagination/tests/settings.py index 1572dfc..10243b8 100644 --- a/linaro_django_pagination/tests/settings.py +++ b/fnp_django_pagination/tests/settings.py @@ -8,5 +8,5 @@ DATABASES = { SECRET_KEY = 'fake-key' INSTALLED_APPS = ( - 'linaro_django_pagination', + 'fnp_django_pagination', ) diff --git a/linaro_django_pagination/tests/test_main.py b/fnp_django_pagination/tests/test_main.py similarity index 97% rename from linaro_django_pagination/tests/test_main.py rename to fnp_django_pagination/tests/test_main.py index 2409b0f..8885c16 100644 --- a/linaro_django_pagination/tests/test_main.py +++ b/fnp_django_pagination/tests/test_main.py @@ -37,9 +37,9 @@ try: except ImportError: # Django 1.2 compatible from django.test import TestCase as SimpleTestCase -from linaro_django_pagination.paginator import InfinitePaginator, FinitePaginator -from linaro_django_pagination.templatetags.pagination_tags import paginate -from linaro_django_pagination.middleware import PaginationMiddleware +from fnp_django_pagination.paginator import InfinitePaginator, FinitePaginator +from fnp_django_pagination.templatetags.pagination_tags import paginate +from fnp_django_pagination.middleware import PaginationMiddleware class HttpRequest(DjangoHttpRequest): @@ -301,7 +301,7 @@ class InfinitePaginatorTestCase(SimpleTestCase): def test_paginator_repr(self): self.assertEqual( repr(InfinitePaginator), - "", + "", ) def test_validate_number(self): @@ -342,7 +342,7 @@ class FinitePaginatorTestCase(SimpleTestCase): def test_repr(self): self.assertEqual( repr(FinitePaginator), - "" + "" ) def test_validate_number(self): diff --git a/setup.py b/setup.py index 0a9781e..49d9d4a 100755 --- a/setup.py +++ b/setup.py @@ -32,19 +32,19 @@ import os from setuptools import setup, find_packages -os.environ['DJANGO_SETTINGS_MODULE'] = 'linaro_django_pagination.tests.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'fnp_django_pagination.tests.settings' setup( - name='linaro-django-pagination', + name='fnp-django-pagination', # Magic version handling with versiontools - version=":versiontools:linaro_django_pagination:__version__", + version=":versiontools:fnp_django_pagination:__version__", author='Zygmunt Krynicki', author_email='zygmunt.krynicki@linaro.org', - description="linaro-django-pagination", + description="fnp-django-pagination", long_description=open("README.rst").read(), keywords='pagination,django', - url='https://github.com/zyga/django-pagination', - test_suite="linaro_django_pagination.tests.runner.runtests", + url='https://github.com/fnp/django-pagination', + test_suite="fnp_django_pagination.tests.runner.runtests", license='BSD', packages=find_packages(), classifiers=[ -- 2.20.1