rename wagtail_xmlimport to wagtail_wordpress_import

Author: nickmoreton

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - checkout
       - run: pip install flake8
-      - run: flake8 wagtail_xmlimport
+      - run: flake8 wagtail_wordpress_import
 
   prettier:
     docker:

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 branch = True
-include = wagtail_xmlimport/*
+include = wagtail_wordpress_import/*
 omit = */migrations/*,*/tests/*
 
 [report]

.github/workflows/test.yml

@@ -63,5 +63,5 @@ jobs:
         run: |
           tox
         env:
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432/wagtail_xmlimport
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/wagtail_wordpress_import
           TOXENV: python${{ matrix.python }}-django${{ matrix.django }}-wagtail${{ matrix.wagtail }}-postgres

.gitignore

@@ -1,15 +1,15 @@
 *.pyc
 /build
 /dist
-/wagtail_xmlimport.egg-info
+/wagtail_wordpress_import.egg-info
 /.coverage
 /htmlcov
 /.tox
 /venv
 /.vscode
 /site
-/test_wagtail_xmlimport.db
+/test_wagtail_wordpress_import.db
 /node_modules
 /test-static
 /test-media
-.DS_Store
+.DS_Store

MANIFEST.in

@@ -1,4 +1,4 @@
 include LICENSE *.rst *.txt *.md
-graft wagtail_xmlimport
+graft wagtail_wordpress_import
 global-exclude __pycache__
 global-exclude *.py[co]

README.md

@@ -2,12 +2,12 @@
   "name": "wagtail-xmlimport",
   "version": "1.0.0",
   "description": "",
-  "main": "wagtail_xmlimport/static_src/main.tsx",
+  "main": "wagtail_wordpress_import/static_src/main.tsx",
   "scripts": {
     "build": "webpack --mode=production",
     "start": "webpack --mode=development --watch",
-    "format": "prettier --write wagtail_xmlimport/**/*.{ts,tsx,scss}",
-    "lint": "prettier --check wagtail_xmlimport/**/*.{ts,tsx,scss}"
+    "format": "prettier --write wagtail_wordpress_import/**/*.{ts,tsx,scss}",
+    "lint": "prettier --check wagtail_wordpress_import/**/*.{ts,tsx,scss}"
   },
   "author": "",
   "license": "ISC",

package.json

@@ -4,7 +4,7 @@
 
 from setuptools import find_packages, setup
 
-from wagtail_xmlimport import __version__
+from wagtail_wordpress_import import __version__
 
 
 this_directory = path.abspath(path.dirname(__file__))

setup.py

@@ -9,7 +9,7 @@
 from django.core.management import execute_from_command_line
 
 
-os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail_xmlimport.test.settings"
+os.environ["DJANGO_SETTINGS_MODULE"] = "wagtail_wordpress_import.test.settings"
 
 
 def make_parser():

testmanage.py

@@ -37,9 +37,9 @@ deps =
     postgres: psycopg2>=2.8,<2.9
 
 setenv =
-    postgres: DATABASE_URL={env:DATABASE_URL:postgres:///wagtail_xmlimport}
+    postgres: DATABASE_URL={env:DATABASE_URL:postgres:///wagtail_wordpress_import}
 
 [testenv:flake8]
 basepython=python3.7
 deps=flake8>=2.2.0
-commands=flake8 wagtail_xmlimport
+commands=flake8 wagtail_wordpress_import

tox.ini

@@ -9,7 +9,7 @@
         "esModuleInterop": true
     },
     "files": [
-        "wagtail_xmlimport/static_src/main.tsx",
-        "wagtail_xmlimport/static_src/custom.d.ts"
+        "wagtail_wordpress_import/static_src/main.tsx",
+        "wagtail_wordpress_import/static_src/custom.d.ts"
     ]
 }

tsconfig.json

@@ -0,0 +1,5 @@
+default_app_config = "wagtail_wordpress_import.apps.WagtailXmlimportAppConfig"
+
+
+VERSION = (0, 1, 0)
+__version__ = ".".join(map(str, VERSION))

wagtail_wordpress_import/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 class WagtailXmlimportAppConfig(AppConfig):
-    label = "wagtail_xmlimport"
-    name = "wagtail_xmlimport"
+    label = "wagtail_wordpress_import"
+    name = "wagtail_wordpress_import"
     verbose_name = "Wagtail xmlimport"

wagtail_xmlimport/analysis.py wagtail_wordpress_import/analysis.py

@@ -1,5 +1,5 @@
 from bs4 import BeautifulSoup as bs4
-from wagtail_xmlimport.constants import (
+from wagtail_wordpress_import.constants import (
     ALLOWED_TAGS,
     ALLOWED_STYLES,
     ALLOWED_ATTRIBUTES,
@@ -15,7 +15,7 @@ def bleach_clean(value):
     """
     Clean up the raw html to be on the safe side.
     Keeping all styles in place that we know of and care about.
-    See ALLOWED lists in wagtail-xmlimport/wagtail_xmlimport/constants.py
+    See ALLOWED lists in wagtail-xmlimport/wagtail_wordpress_import/constants.py
     """
 
     cleaned = Cleaner(

wagtail_xmlimport/apps.py wagtail_wordpress_import/apps.py

@@ -18,7 +18,7 @@ class HeadingBlock(blocks.StructBlock):
 
     class Meta:
         icon = "title"
-        template = "wagtail_xmlimport/heading_block.html"
+        template = "wagtail_wordpress_import/heading_block.html"
 
 
 class ImageBlock(blocks.StructBlock):
@@ -27,7 +27,7 @@ class ImageBlock(blocks.StructBlock):
 
     class Meta:
         icon = "image"
-        template = "wagtail_xmlimport/image_block.html"
+        template = "wagtail_wordpress_import/image_block.html"
 
 
 class QuoteBlock(blocks.StructBlock):
@@ -36,7 +36,7 @@ class QuoteBlock(blocks.StructBlock):
 
     class Meta:
         icon = "openquote"
-        template = "wagtail_xmlimport/quote_block.html"
+        template = "wagtail_wordpress_import/quote_block.html"
 
 
 class WPImportStreamBlocks(blocks.StreamBlock):

wagtail_xmlimport/bleach.py wagtail_wordpress_import/bleach.py

@@ -7,7 +7,7 @@
 from django.apps import apps
 from django.utils.text import slugify
 from django.utils.timezone import make_aware
-from wagtail_xmlimport.functions import linebreaks_wp
+from wagtail_wordpress_import.functions import linebreaks_wp
 
 
 class PageBuilder:

wagtail_xmlimport/block_builder.py wagtail_wordpress_import/block_builder.py

@@ -7,7 +7,7 @@
 from django.apps import apps
 from django.utils.text import slugify
 from django.utils.timezone import make_aware
-from wagtail_xmlimport.functions import linebreaks_wp
+from wagtail_wordpress_import.functions import linebreaks_wp
 
 
 class PageMaker:

wagtail_xmlimport/blocks.py wagtail_wordpress_import/blocks.py

@@ -3,8 +3,8 @@
 from xml.dom import pulldom
 
 from wagtail.core.models import Page
-from wagtail_xmlimport.cls.page_builder import PageBuilder
-from wagtail_xmlimport.functions import node_to_dict
+from wagtail_wordpress_import.cls.page_builder import PageBuilder
+from wagtail_wordpress_import.functions import node_to_dict
 
 
 class XmlImporter:

wagtail_xmlimport/cls/__init__.py wagtail_wordpress_import/cls/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 class WagtailXmlimportImportersConfig(AppConfig):
-    label = "wagtail_xmlimport_importers"
-    name = "wagtail_xmlimport_importers"
+    label = "wagtail_wordpress_import_importers"
+    name = "wagtail_wordpress_import_importers"
     verbose_name = "Wagtail xmlimport importers"

wagtail_xmlimport/cls/page_builder.py wagtail_wordpress_import/cls/page_builder.py

@@ -7,10 +7,10 @@
 from django.utils.timezone import make_aware
 from wagtail.core import blocks
 from wagtail.core.models import Page
-from wagtail_xmlimport.bleach import bleach_clean, fix_styles
-from wagtail_xmlimport.block_builder import BlockBuilder
-from wagtail_xmlimport.functions import linebreaks_wp, node_to_dict
-from wagtail_xmlimport.importers import wordpress_mapping
+from wagtail_wordpress_import.bleach import bleach_clean, fix_styles
+from wagtail_wordpress_import.block_builder import BlockBuilder
+from wagtail_wordpress_import.functions import linebreaks_wp, node_to_dict
+from wagtail_wordpress_import.importers import wordpress_mapping
 
 
 class WordpressImporter:

wagtail_xmlimport/cls/page_maker.py wagtail_wordpress_import/cls/page_maker.py

@@ -3,8 +3,8 @@
 from django.core.management.base import BaseCommand
 from prettytable import PrettyTable
 
-from wagtail_xmlimport.importers.wordpress import WordpressImporter
-from wagtail_xmlimport.analysis import HTMLAnalyzer
+from wagtail_wordpress_import.importers.wordpress import WordpressImporter
+from wagtail_wordpress_import.analysis import HTMLAnalyzer
 
 
 class Command(BaseCommand):

wagtail_xmlimport/cls/progress.py wagtail_wordpress_import/cls/progress.py

@@ -2,7 +2,7 @@
 import os
 
 from django.core.management.base import BaseCommand
-from wagtail_xmlimport.cls.util import PathsToDict
+from wagtail_wordpress_import.cls.util import PathsToDict
 
 
 class Command(BaseCommand):

wagtail_xmlimport/cls/util.py wagtail_wordpress_import/cls/util.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 from django.core.management.base import BaseCommand
-from wagtail_xmlimport.importers.wordpress import WordpressImporter
+from wagtail_wordpress_import.importers.wordpress import WordpressImporter
 
 LOG_DIR = "log"
 

wagtail_xmlimport/cls/xml_importer.py wagtail_wordpress_import/cls/xml_importer.py

@@ -0,0 +1 @@
+default_app_config = "wagtail_wordpress_import.test.apps.WagtailXmlimportTestAppConfig"

wagtail_xmlimport/constants.py wagtail_wordpress_import/constants.py

@@ -2,6 +2,6 @@
 
 
 class WagtailXmlimportTestAppConfig(AppConfig):
-    label = "wagtail_xmlimport_test"
-    name = "wagtail_xmlimport.test"
+    label = "wagtail_wordpress_import_test"
+    name = "wagtail_wordpress_import.test"
     verbose_name = "Wagtail xmlimport tests"

wagtail_xmlimport/fixtures/test.json wagtail_wordpress_import/fixtures/test.json

@@ -33,8 +33,8 @@
 # Application definition
 
 INSTALLED_APPS = [
-    "wagtail_xmlimport",
-    "wagtail_xmlimport.test",
+    "wagtail_wordpress_import",
+    "wagtail_wordpress_import.test",
     "wagtail.contrib.search_promotions",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
@@ -73,7 +73,7 @@
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
-ROOT_URLCONF = "wagtail_xmlimport.test.urls"
+ROOT_URLCONF = "wagtail_wordpress_import.test.urls"
 
 TEMPLATES = [
     {
@@ -111,7 +111,7 @@
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 
 DATABASES = {
-    "default": dj_database_url.config(default="sqlite:///test_wagtail_xmlimport.db"),
+    "default": dj_database_url.config(default="sqlite:///test_wagtail_wordpress_import.db"),
 }
 
 

wagtail_xmlimport/fixtures/test.xml wagtail_wordpress_import/fixtures/test.xml

@@ -2,8 +2,8 @@
 
 from django.test import TestCase
 
-from wagtail_xmlimport.functions import linebreaks_wp
-from wagtail_xmlimport.bleach import bleach_clean, fix_styles
+from wagtail_wordpress_import.functions import linebreaks_wp
+from wagtail_wordpress_import.bleach import bleach_clean, fix_styles
 
 BASE_PATH = os.path.dirname(os.path.dirname(__file__))
 FIXTURES_PATH = BASE_PATH + "/test_fixtures"

wagtail_xmlimport/functions.py wagtail_wordpress_import/functions.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from wagtail_xmlimport.block_builder import check_image_src
+from wagtail_wordpress_import.block_builder import check_image_src
 
 class TestBlockBuilder(TestCase):
 
@@ -8,4 +8,4 @@ def test_check_image_src(self):
         src2 = "folder/myimage.gif"
 
         self.assertEqual(check_image_src(src1), "https://www.budgetsaresexy.com/folder/myimage.gif")
-        self.assertEqual(check_image_src(src2), "https://www.budgetsaresexy.com/folder/myimage.gif")
+        self.assertEqual(check_image_src(src2), "https://www.budgetsaresexy.com/folder/myimage.gif")

wagtail_xmlimport/importers/__init__.py wagtail_wordpress_import/importers/__init__.py

@@ -1,8 +1,8 @@
 from django.test import TestCase
-from wagtail_xmlimport.management.commands import import_xml
-from wagtail_xmlimport.management.commands.import_xml import Command as RunCmd
-from wagtail_xmlimport.management.commands.reduce_xml import Command as ReduceCmd
-from wagtail_xmlimport.management.commands.extract_xml_mapping import Command as DiscoveryCmd
+from wagtail_wordpress_import.management.commands import import_xml
+from wagtail_wordpress_import.management.commands.import_xml import Command as RunCmd
+from wagtail_wordpress_import.management.commands.reduce_xml import Command as ReduceCmd
+from wagtail_wordpress_import.management.commands.extract_xml_mapping import Command as DiscoveryCmd
 
 
 class TestRunXmlCommand(TestCase):

wagtail_xmlimport/importers/apps.py wagtail_wordpress_import/importers/apps.py

@@ -1,8 +1,8 @@
 import json
 from datetime import datetime
 from django.test import TestCase
-from wagtail_xmlimport.importers import wordpress_mapping
-from wagtail_xmlimport.importers.wordpress import WordpressImporter
+from wagtail_wordpress_import.importers import wordpress_mapping
+from wagtail_wordpress_import.importers.wordpress import WordpressImporter
 
 
 class ImpoterTests(TestCase):

wagtail_xmlimport/importers/wordpress.py wagtail_wordpress_import/importers/wordpress.py

@@ -3,7 +3,7 @@
 from django.test import TestCase
 from lxml import etree
 
-from wagtail_xmlimport.cls.util import MaxDepthEtree, PathsToDict
+from wagtail_wordpress_import.cls.util import MaxDepthEtree, PathsToDict
 
 FIXTURES_DIR = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

wagtail_xmlimport/importers/wordpress_mapping.py wagtail_wordpress_import/importers/wordpress_mapping.py

@@ -8,7 +8,7 @@ def register_admin_urls():
     urls = [
         path(
             "jsi18n/",
-            JavaScriptCatalog.as_view(packages=["wagtail_xmlimport"]),
+            JavaScriptCatalog.as_view(packages=["wagtail_wordpress_import"]),
             name="javascript_catalog",
         ),
         # Add your other URLs here, and they will appear under `/admin/xmlimport/`
@@ -19,8 +19,8 @@ def register_admin_urls():
         path(
             "xmlimport/",
             include(
-                (urls, "wagtail_xmlimport"),
-                namespace="wagtail_xmlimport",
+                (urls, "wagtail_wordpress_import"),
+                namespace="wagtail_wordpress_import",
             ),
         )
     ]