Merge pull request #4559 from korycins/move_extensions_module

Move core.extensions to separate module

CHANGELOG.md

@@ -17,7 +17,7 @@ All notable, unreleased changes to this project will be documented in this file.
   - Greek
 - Extensions Manager - #4497 by @korycins
 - Migration of tax logic into a plugin architecture - #4497 by @korycins
-
+- Move core.extensions to separate module - #4559 by @korycins
 - Fix searches and pickers - #4487 by @dominik-zeglen
 - Fix dashboard menu styles - #4491 by @benekex2
 - Do not allow random ids to appear in snapshots - #4495 by @dominik-zeglen

saleor/celeryconf.py

@@ -3,7 +3,7 @@
 from celery import Celery
 from django.conf import settings
 
-from .core.extensions import discover_plugins_modules
+from .extensions import discover_plugins_modules
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "saleor.settings")
 

saleor/checkout/forms.py

@@ -11,10 +11,10 @@
 from django_countries.fields import Country, LazyTypedChoiceField
 
 from ..core.exceptions import InsufficientStock
-from ..core.extensions.manager import get_extensions_manager
 from ..core.taxes import display_gross_prices
 from ..core.utils import format_money
 from ..discount.models import NotApplicable, Voucher
+from ..extensions.manager import get_extensions_manager
 from ..shipping.models import ShippingMethod, ShippingZone
 from .models import Checkout
 

saleor/checkout/utils.py

@@ -17,7 +17,6 @@
 from ..account.models import Address, User
 from ..account.utils import store_user_address
 from ..core.exceptions import InsufficientStock
-from ..core.extensions.manager import get_extensions_manager
 from ..core.taxes import quantize_price, zero_money, zero_taxed_money
 from ..core.utils import to_local_currency
 from ..core.utils.promo_code import (
@@ -35,6 +34,7 @@
     remove_voucher_usage_by_customer,
     validate_voucher_for_checkout,
 )
+from ..extensions.manager import get_extensions_manager
 from ..giftcard.utils import (
     add_gift_card_code_to_checkout,
     remove_gift_card_code_from_checkout,

saleor/core/__init__.py

@@ -1,8 +1,6 @@
 from django.conf import settings
 from django.core.checks import Warning, register
 
-from .extensions.checks import check_extensions  # NOQA: F401
-
 TOKEN_PATTERN = (
     "(?P<token>[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}" "-[0-9a-z]{12})"
 )

saleor/core/middleware.py

@@ -9,8 +9,8 @@
 from django_countries.fields import Country
 
 from ..discount.utils import fetch_discounts
+from ..extensions.manager import get_extensions_manager
 from . import analytics
-from .extensions.manager import get_extensions_manager
 from .utils import get_client_ip, get_country_by_ip, get_currency_for_country
 
 logger = logging.getLogger(__name__)

saleor/core/utils/random_data.py

@@ -24,6 +24,7 @@
 from ...discount import DiscountValueType, VoucherType
 from ...discount.models import Sale, Voucher
 from ...discount.utils import fetch_discounts
+from ...extensions.manager import get_extensions_manager
 from ...giftcard.models import GiftCard
 from ...menu.models import Menu
 from ...menu.utils import update_menu
@@ -53,7 +54,6 @@
     create_product_thumbnails,
 )
 from ...shipping.models import ShippingMethod, ShippingMethodType, ShippingZone
-from ..extensions.manager import get_extensions_manager
 
 fake = Factory.create()
 

saleor/dashboard/order/forms.py

@@ -11,10 +11,10 @@
 from ...account.models import User
 from ...checkout.forms import QuantityField
 from ...core.exceptions import InsufficientStock
-from ...core.extensions.manager import get_extensions_manager
 from ...core.taxes import zero_taxed_money
 from ...discount.models import Voucher
 from ...discount.utils import decrease_voucher_usage, increase_voucher_usage
+from ...extensions.manager import get_extensions_manager
 from ...order import OrderStatus, events
 from ...order.models import Fulfillment, FulfillmentLine, Order, OrderLine
 from ...order.utils import (

saleor/dashboard/product/forms.py

@@ -9,9 +9,9 @@
 from django.utils.translation import pgettext_lazy
 from mptt.forms import TreeNodeChoiceField
 
-from ...core.extensions.manager import get_extensions_manager
 from ...core.taxes import include_taxes_in_prices
 from ...core.weight import WeightField
+from ...extensions.manager import get_extensions_manager
 from ...product.models import (
     Attribute,
     AttributeValue,

saleor/dashboard/taxes/views.py

@@ -13,11 +13,11 @@
 from django_countries.fields import Country
 from django_prices_vatlayer.models import VAT
 
-from ...core.extensions.plugins.vatlayer import TaxRateType, get_taxes_for_country
 from ...core.utils import get_paginator_items
 from ...dashboard.taxes.filters import TaxFilter
 from ...dashboard.taxes.forms import TaxesConfigurationForm
 from ...dashboard.views import staff_member_required
+from ...extensions.plugins.vatlayer import TaxRateType, get_taxes_for_country
 
 logger = logging.getLogger(__name__)
 

saleor/discount/utils.py

@@ -5,8 +5,8 @@
 from django.db.models import F
 from django.utils.translation import pgettext
 
-from ..core.extensions.manager import get_extensions_manager
 from ..core.taxes import zero_money
+from ..extensions.manager import get_extensions_manager
 from . import DiscountInfo
 from .models import NotApplicable, Sale, VoucherCustomer
 

saleor/core/extensions/__init__.py → saleor/extensions/__init__.py

@@ -1,6 +1,8 @@
 import importlib
 from typing import List
 
+from .checks import check_extensions  # NOQA: F401
+
 
 def discover_plugins_modules(plugins: List[str]):
     plugins_modules = []

saleor/core/extensions/base_plugin.py → saleor/extensions/base_plugin.py

@@ -5,11 +5,11 @@
 from prices import Money, MoneyRange, TaxedMoney, TaxedMoneyRange
 
 if TYPE_CHECKING:
-    from ..taxes import TaxType
-    from ...checkout.models import Checkout, CheckoutLine
-    from ...product.models import Product
-    from ...account.models import Address
-    from ...order.models import OrderLine, Order
+    from ..core.taxes import TaxType
+    from ..checkout.models import Checkout, CheckoutLine
+    from ..product.models import Product
+    from ..account.models import Address
+    from ..order.models import OrderLine, Order
 
 
 class BasePlugin:

saleor/core/extensions/manager.py → saleor/extensions/manager.py

@@ -6,14 +6,14 @@
 from django_countries.fields import Country
 from prices import Money, MoneyRange, TaxedMoney, TaxedMoneyRange
 
-from ..taxes import TaxType, quantize_price
+from ..core.taxes import TaxType, quantize_price
 
 if TYPE_CHECKING:
     from .base_plugin import BasePlugin
-    from ...checkout.models import Checkout, CheckoutLine
-    from ...product.models import Product
-    from ...account.models import Address
-    from ...order.models import OrderLine, Order
+    from ..checkout.models import Checkout, CheckoutLine
+    from ..product.models import Product
+    from ..account.models import Address
+    from ..order.models import OrderLine, Order
 
 
 class ExtensionsManager:

saleor/core/extensions/plugins/avatax/__init__.py → saleor/extensions/plugins/avatax/__init__.py

@@ -12,8 +12,8 @@
 from requests.auth import HTTPBasicAuth
 
 if TYPE_CHECKING:
-    from .....checkout.models import Checkout
-    from .....order.models import Order
+    from ....checkout.models import Checkout
+    from ....order.models import Order
 
 logger = logging.getLogger(__name__)
 

saleor/core/extensions/plugins/avatax/plugin.py → saleor/extensions/plugins/avatax/plugin.py

@@ -6,7 +6,7 @@
 from django.conf import settings
 from prices import Money, TaxedMoney, TaxedMoneyRange
 
-from ....taxes import TaxError, TaxType, zero_taxed_money
+from ....core.taxes import TaxError, TaxType, zero_taxed_money
 from ...base_plugin import BasePlugin
 from . import (
     META_FIELD,
@@ -25,8 +25,8 @@
 from .tasks import api_post_request_task
 
 if TYPE_CHECKING:
-    from .....checkout.models import Checkout, CheckoutLine
-    from .....order.models import Order, OrderLine
+    from ....checkout.models import Checkout, CheckoutLine
+    from ....order.models import Order, OrderLine
 
 logger = logging.getLogger(__name__)
 

saleor/core/extensions/plugins/vatlayer/__init__.py → saleor/extensions/plugins/vatlayer/__init__.py

@@ -2,7 +2,7 @@
 from django_prices_vatlayer.utils import get_tax_for_rate, get_tax_rates_for_country
 from prices import Money, MoneyRange, TaxedMoney, TaxedMoneyRange
 
-from ....taxes import charge_taxes_on_shipping, include_taxes_in_prices
+from ....core.taxes import charge_taxes_on_shipping, include_taxes_in_prices
 
 
 class TaxRateType:

saleor/core/extensions/plugins/vatlayer/plugin.py → saleor/extensions/plugins/vatlayer/plugin.py

@@ -6,7 +6,7 @@
 from django_prices_vatlayer.utils import get_tax_rate_types
 from prices import Money, MoneyRange, TaxedMoney, TaxedMoneyRange
 
-from ....taxes import TaxType
+from ....core.taxes import TaxType
 from ...base_plugin import BasePlugin
 from . import (
     DEFAULT_TAX_RATE_NAME,
@@ -18,10 +18,10 @@
 
 if TYPE_CHECKING:
 
-    from .....checkout.models import Checkout, CheckoutLine
-    from .....product.models import Product
-    from .....account.models import Address
-    from .....order.models import OrderLine, Order
+    from ....checkout.models import Checkout, CheckoutLine
+    from ....product.models import Product
+    from ....account.models import Address
+    from ....order.models import OrderLine, Order
 
 
 class VatlayerPlugin(BasePlugin):

saleor/graphql/core/enums.py

@@ -1,8 +1,8 @@
 import graphene
 
-from ...core.extensions.plugins.vatlayer import TaxRateType as CoreTaxRateType
 from ...core.permissions import MODELS_PERMISSIONS
 from ...core.weight import WeightUnits
+from ...extensions.plugins.vatlayer import TaxRateType as CoreTaxRateType
 from .utils import str_to_enum
 
 # FIXME CoreTaxRateType should be removed after we will drop old api fields dedicated

saleor/order/utils.py

@@ -8,11 +8,11 @@
 
 from ..account.utils import store_user_address
 from ..checkout import AddressType
-from ..core.extensions.manager import get_extensions_manager
 from ..core.taxes import zero_money
 from ..core.weight import zero_weight
 from ..dashboard.order.utils import get_voucher_discount_for_order
 from ..discount.models import NotApplicable
+from ..extensions.manager import get_extensions_manager
 from ..order import FulfillmentStatus, OrderStatus, emails
 from ..order.models import Fulfillment, FulfillmentLine, Order, OrderLine
 from ..payment import ChargeStatus

saleor/product/utils/availability.py

@@ -7,9 +7,9 @@
 from saleor.graphql.core.types import MoneyRange
 from saleor.product.models import Product, ProductVariant
 
-from ...core.extensions.manager import get_extensions_manager
 from ...core.utils import to_local_currency
 from ...discount import DiscountInfo
+from ...extensions.manager import get_extensions_manager
 from .. import ProductAvailabilityStatus, VariantAvailabilityStatus
 
 ProductAvailability = namedtuple(

saleor/product/utils/variants_picker.py

@@ -4,10 +4,10 @@
 
 from django_prices.templatetags import prices_i18n
 
-from ...core.extensions.manager import get_extensions_manager
 from ...core.taxes import display_gross_prices
 from ...core.utils import to_local_currency
 from ...discount import DiscountInfo
+from ...extensions.manager import get_extensions_manager
 from ...seo.schema.product import variant_json_ld
 from .availability import get_product_availability
 

saleor/settings.py

@@ -231,6 +231,7 @@ def get_bool_from_env(name, default_value):
     "django.contrib.postgres",
     "django.forms",
     # Local apps
+    "saleor.extensions",
     "saleor.account",
     "saleor.discount",
     "saleor.giftcard",
@@ -676,7 +677,7 @@ def get_host():
     "RELAY_CONNECTION_MAX_LIMIT": 100,
 }
 
-EXTENSIONS_MANAGER = "saleor.core.extensions.manager.ExtensionsManager"
+EXTENSIONS_MANAGER = "saleor.extensions.manager.ExtensionsManager"
 
 PLUGINS = os.environ.get("PLUGINS", [])
 

tests/api/test_product.py

@@ -11,8 +11,8 @@
 from graphql_relay import to_global_id
 from prices import Money
 
-from saleor.core.extensions.manager import ExtensionsManager
 from saleor.core.taxes import TaxType
+from saleor.extensions.manager import ExtensionsManager
 from saleor.graphql.core.enums import ReportingPeriod
 from saleor.graphql.product.enums import StockAvailability
 from saleor.graphql.product.types.products import resolve_attribute_list
@@ -1309,7 +1309,7 @@ def test_product_type_create_mutation(
     staff_api_client, product_type, permission_manage_products, monkeypatch, settings
 ):
     settings.VATLAYER_ACCESS_KEY = "test"
-    settings.PLUGINS = ["saleor.core.extensions.plugins.vatlayer.plugin.VatlayerPlugin"]
+    settings.PLUGINS = ["saleor.extensions.plugins.vatlayer.plugin.VatlayerPlugin"]
     manager = ExtensionsManager(plugins=settings.PLUGINS)
     query = """
     mutation createProductType(

tests/api/test_variant_pricing.py

@@ -2,7 +2,7 @@
 
 from prices import Money, TaxedMoney
 
-from saleor.core.extensions.manager import ExtensionsManager
+from saleor.extensions.manager import ExtensionsManager
 from saleor.product.models import ProductVariant
 from saleor.product.utils.availability import get_variant_availability
 from tests.api.utils import get_graphql_content

tests/extensions/plugins/conftest.py

@@ -46,7 +46,7 @@ def taxes(tax_rates):
 @pytest.fixture
 def vatlayer(db, settings, tax_rates, taxes):
     settings.VATLAYER_ACCESS_KEY = "enablevatlayer"
-    settings.PLUGINS = ["saleor.core.extensions.plugins.vatlayer.plugin.VatlayerPlugin"]
+    settings.PLUGINS = ["saleor.extensions.plugins.vatlayer.plugin.VatlayerPlugin"]
     VAT.objects.create(country_code="PL", data=tax_rates)
 
     tax_rates_2 = {