aggiornamento dati

.github/workflows/plone-package.yml

@@ -18,12 +18,17 @@ jobs:
                 plone-version:
                   - 'Plone52'
                   - 'Plone60'
-                python-version: [3.7, 3.8, 3.9]
+                python-version: ["3.8", "3.11"]
+                exclude:
+                  - plone-version: Plone52
+                    python-version: "3.11"
+                  - plone-version: Plone60
+                    python-version: "3.8"
 
         steps:
             - uses: actions/setup-python@v4
               with:
-                  python-version: '3.9'
+                  python-version: '3.11'
             - uses: actions/checkout@v3
             - uses: actions/cache@v3
               with:
@@ -49,17 +54,12 @@ jobs:
               run: |
                   python -m pip install --upgrade pip
                   pip install tox tox-gh-actions
-            - name: Black-Check
-              run: |
-                  tox -r -e black-check
+            # - name: Black-Check
+            #   run: |
+            #       tox -r -e black-check
             - name: Test with tox
               run: |
                   tox -r
               env:
                 PLONE-VERSION: ${{ matrix.plone-version }}
                 PYTHON-VERSION: ${{ matrix.python-version }}
-            - name: "Upload coverage to Codecov"
-              uses: "codecov/codecov-action@v3"
-              with:
-                fail_ci_if_error: true
-              if: matrix.python-version == '3.7'

.gitignore

@@ -34,6 +34,7 @@ pyvenv.cfg
 report.html
 .vscode/
 .tox/
+.python-version
 reports/
 venv/
 # excludes

CHANGES.rst

@@ -2,10 +2,15 @@ Changelog
 =========
 
 
-1.0.2 (unreleased)
+1.1.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- aggiornati i dati con nuuovo CSV da ISTAT
+  [mamico]
+- fix CI / gha
+  [mamico]
+- aggiunte costanti per dizionari precalcolati per PROVINCE e COMUNI
+  [mamico]
 
 
 1.0.1 (2024-03-12)

base.cfg

@@ -14,9 +14,6 @@ parts =
     releaser
     i18ndude
     omelette
-    robot
-    plone-helper-scripts
-    vscode
 
 develop = .
 
@@ -32,17 +29,6 @@ eggs =
     Pillow
     redturtle.unitaterritoriali [test]
 
-[vscode]
-recipe = collective.recipe.vscode
-eggs = ${instance:eggs}
-autocomplete-use-omelette = True
-
-# [code-analysis]
-# recipe = plone.recipe.codeanalysis
-# directory = ${buildout:directory}/src/redturtle
-# return-status-codes = False
-
-
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${instance:eggs}
@@ -80,13 +66,6 @@ recipe = zc.recipe.egg
 eggs = createcoverage
 
 
-[robot]
-recipe = zc.recipe.egg
-eggs =
-    ${test:eggs}
-    plone.app.robotframework[debug,reload]
-
-
 [releaser]
 recipe = zc.recipe.egg
 eggs = zest.releaser
@@ -96,16 +75,6 @@ eggs = zest.releaser
 recipe = zc.recipe.egg
 eggs = i18ndude
 
-[plone-helper-scripts]
-recipe = zc.recipe.egg
-eggs =
-    plone.staticresources
-    ${instance:eggs}
-interpreter = zopepy
-scripts =
-    zopepy
-    plone-compile-resources
-
 [versions]
 # Don't use a released version of redturtle.unitaterritoriali
 redturtle.unitaterritoriali =

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="redturtle.unitaterritoriali",
-    version="1.0.2.dev0",
+    version="1.1.0.dev0",
     description="An add-on for Plone",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/
@@ -53,10 +53,6 @@
     python_requires=">=3.7",
     install_requires=[
         "setuptools",
-        # -*- Extra requirements: -*-
-        "z3c.jbot",
-        "plone.api>=1.8.4",
-        "plone.app.dexterity",
     ],
     extras_require={
         "test": [
@@ -66,13 +62,10 @@
             # plone_coredev tests as of 2016-04-01.
             "plone.testing>=5.0.0",
             "plone.app.contenttypes",
-            "plone.app.robotframework[debug]",
         ],
     },
     entry_points="""
     [z3c.autoinclude.plugin]
     target = plone
-    [console_scripts]
-    update_locale = redturtle.unitaterritoriali.locales.update:update_locale
     """,
 )

src/redturtle/unitaterritoriali/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """Init and utils."""
+
 from zope.i18nmessageid import MessageFactory
 
 

src/redturtle/unitaterritoriali/testing.py

@@ -1,29 +1,16 @@
 # -*- coding: utf-8 -*-
-from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
-from plone.app.testing import applyProfile
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PLONE_FIXTURE
 from plone.app.testing import PloneSandboxLayer
-from plone.testing import z2
 
 import redturtle.unitaterritoriali
 
 
 class RedturtleUnitaterritorialiLayer(PloneSandboxLayer):
-
     defaultBases = (PLONE_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
-        # Load any other ZCML that is required for your tests.
-        # The z3c.autoinclude feature is disabled in the Plone fixture base
-        # layer.
-        import plone.app.dexterity
-
-        self.loadZCML(package=plone.app.dexterity)
-        import plone.restapi
-
-        self.loadZCML(package=plone.restapi)
         self.loadZCML(package=redturtle.unitaterritoriali)
 
     def setUpPloneSite(self, portal):
@@ -39,17 +26,7 @@ def setUpPloneSite(self, portal):
 )
 
 
-REDTURTLE_UNITATERRITORIALI_FUNCTIONAL_TESTING = FunctionalTesting(
+FUNCTIONAL_TESTING = FunctionalTesting(
     bases=(REDTURTLE_UNITATERRITORIALI_FIXTURE,),
     name="RedturtleUnitaterritorialiLayer:FunctionalTesting",
 )
-
-
-REDTURTLE_UNITATERRITORIALI_ACCEPTANCE_TESTING = FunctionalTesting(
-    bases=(
-        REDTURTLE_UNITATERRITORIALI_FIXTURE,
-        REMOTE_LIBRARY_BUNDLE_FIXTURE,
-        z2.ZSERVER_FIXTURE,
-    ),
-    name="RedturtleUnitaterritorialiLayer:AcceptanceTesting",
-)

src/redturtle/unitaterritoriali/tests/test_utility.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-import unittest
-from zope.component import getUtility
 from redturtle.unitaterritoriali.interfaces import IUnitaTerritorialiUtility
-from redturtle.unitaterritoriali.testing import (
-    REDTURTLE_UNITATERRITORIALI_FUNCTIONAL_TESTING,
-)
+from redturtle.unitaterritoriali.testing import FUNCTIONAL_TESTING
+from redturtle.unitaterritoriali.utility import load_data_from_csv
+from zope.component import getUtility
+
+import unittest
 
 
 class ModelloPraticaIntegrationTest(unittest.TestCase):
-    layer = REDTURTLE_UNITATERRITORIALI_FUNCTIONAL_TESTING
+    layer = FUNCTIONAL_TESTING
 
     def test_utility(self):
         utility = getUtility(IUnitaTerritorialiUtility)
@@ -23,3 +23,19 @@ def test_utility(self):
         res = utility.codice_istat_to_comune(codice_istat)
         self.assertIn("denominazione", res)
         self.assertIn("codice_catastale", res)
+
+    def test_sardegna_2026(self):
+        comuni = load_data_from_csv()
+
+        prov_key = "Denominazione dell'Unità territoriale sovracomunale \n(valida a fini statistici)"
+        self.assertEqual(
+            len([c for c in comuni if c[prov_key] == "Cagliari"]),
+            70,
+        )
+
+        self.assertEqual(
+            len(
+                [c for c in comuni if c[prov_key] == "Medio Campidano"]
+            ),  # ex Sud Sardegna
+            28,
+        )