Merge branch 'main' into docs/community_usage

microsoft · Nov 15, 2024 · 75243ae · 75243ae
2 parents 27c254b + a0a5f89
commit 75243ae
Show file tree

Hide file tree

Showing 32 changed files with 339 additions and 206 deletions.
diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml
@@ -28,10 +28,12 @@ steps:
   - task: DockerCompose@0
     displayName: Push Presidio Images to ACR
     inputs:
-        action: 'Push services'
+        action: Push services
         dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
-        containerregistrytype: 'Container Registry'
-        dockerRegistryEndpoint: 'presidio-acr'
+        containerregistrytype: Azure Container Registry
+        # Passing as an object since by default a double forward-slash is added to the end of the registry name (https://presidio.azurecr.io//oauth2/exchange)
+        azureContainerRegistry: '{"loginServer":"$(ACR_REGISTRY_NAME).azurecr.io"}'
+        azureSubscriptionEndpoint: ${{ parameters.AZURE_SUBSCRIPTION }}
         projectName: 'microsoft_presidio'
         dockerComposeFileArgs: |
           REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}

diff --git a/.pipelines/templates/e2e-tests.yml b/.pipelines/templates/e2e-tests.yml
@@ -21,7 +21,7 @@ steps:
 
     - task: UsePythonVersion@0
       inputs:
-          versionSpec: '3.9'
+          versionSpec: '3.10'
 
     - script: |
           set -eux  # fail on error

diff --git a/.pipelines/templates/lint-build-test.yml b/.pipelines/templates/lint-build-test.yml
@@ -32,14 +32,14 @@ stages:
                 vmImage: 'ubuntu-latest'
             strategy:
                 matrix:
-                    Python38:
-                        python.version: '3.8'
                     Python39:
                         python.version: '3.9'
                     Python310:
                         python.version: '3.10'
                     Python311:
                         python.version: '3.11'
+                    Python312:
+                        python.version: '3.12'
 
             steps:
                 - task: UsePythonVersion@0
@@ -54,14 +54,14 @@ stages:
                 vmImage: 'ubuntu-latest'
             strategy:
                 matrix:
-                    Python38:
-                        python.version: '3.8'
                     Python39:
                         python.version: '3.9'
                     Python310:
                         python.version: '3.10'
                     Python311:
                         python.version: '3.11'
+                    Python312:
+                        python.version: '3.12'
 
             steps:
                 - task: UsePythonVersion@0
@@ -76,14 +76,14 @@ stages:
                 vmImage: 'ubuntu-latest'
             strategy:
                 matrix:
-                    Python38:
-                        python.version: '3.8'
                     Python39:
                         python.version: '3.9'
                     Python310:
                         python.version: '3.10'
                     Python311:
                         python.version: '3.11'
+                    Python312:
+                        python.version: '3.12'
 
             steps:
                 - task: UsePythonVersion@0
@@ -98,14 +98,14 @@ stages:
                 vmImage: 'ubuntu-latest'
             strategy:
                 matrix:
-                    Python38:
-                        python.version: '3.8'
                     Python39:
                         python.version: '3.9'
                     Python310:
                         python.version: '3.10'
                     Python311:
                         python.version: '3.11'
+                    Python312:
+                        python.version: '3.12'
 
             steps:
                 - task: UsePythonVersion@0
@@ -120,14 +120,14 @@ stages:
                 vmImage: 'ubuntu-latest'
             strategy:
                 matrix:
-                    Python38:
-                        python.version: '3.8'
                     Python39:
                         python.version: '3.9'
                     Python310:
                         python.version: '3.10'
                     Python311:
                         python.version: '3.11'
+                    Python312:
+                        python.version: '3.12'
 
             steps:
                 - task: UsePythonVersion@0

diff --git a/.pipelines/templates/test-docs.yml b/.pipelines/templates/test-docs.yml
@@ -7,7 +7,7 @@ pool:
 steps:
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '3.9'
+    versionSpec: '3.10'
     addToPath: true
     architecture: 'x64'
 

diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -46,8 +46,9 @@ stages:
               projectName: 'microsoft_presidio'
               dockerComposeCommand: pull
               dockerComposeFile: docker-compose.yml
-              containerregistrytype: 'Container Registry'
-              dockerRegistryEndpoint: 'presidio-acr'
+              containerregistrytype: Azure Container Registry
+              azureSubscriptionEndpoint: $(ACR_AZURE_SUBSCRIPTION)
+              azureContainerRegistry: '$(ACR_REGISTRY_NAME).azurecr.io'
               dockerComposeFileArgs: |
                 REGISTRY_NAME=$(REGISTRY_NAME)
                 TAG=$(TAG)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,7 +18,7 @@ stages:
       pool:
         vmImage: 'ubuntu-latest'
       variables:
-        REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/'
+        REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io'
         TAG: ':$(Build.BuildId)'
       steps:
         - task: DockerCompose@0

diff --git a/docker-compose-image.yml b/docker-compose-image.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   presidio-image-redactor:
     image: ${REGISTRY_NAME}${IMAGE_PREFIX}presidio-image-redactor${TAG}

diff --git a/docker-compose-text.yml b/docker-compose-text.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   presidio-anonymizer:
     image: ${REGISTRY_NAME}${IMAGE_PREFIX}presidio-anonymizer${TAG}

diff --git a/docker-compose-transformers.yml b/docker-compose-transformers.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   presidio-anonymizer:
     image: ${REGISTRY_NAME}${IMAGE_PREFIX}presidio-anonymizer${TAG}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   presidio-anonymizer:
     image: ${REGISTRY_NAME}${IMAGE_PREFIX}presidio-anonymizer${TAG}

diff --git a/docs/installation.md b/docs/installation.md
@@ -17,11 +17,10 @@ Presidio suite using `pip` (as Python packages) or using `Docker` (As containeri
 
 Presidio is supported for the following python versions:
 
-* 3.7
-* 3.8
 * 3.9
 * 3.10
 * 3.11
+* 3.12
 
 ### PII anonymization on text
 

diff --git a/docs/samples/python/csv_sample_data/test_structured.csv b/docs/samples/python/csv_sample_data/test_structured.csv
@@ -1,4 +1,4 @@
-id,name,email,street,city,state,postal_code
-1,John Doe,john.doe@example.com,123 Main St,Anytown,CA,12345
-2,Jane Smith,jane.smith@example.com,456 Elm St,Somewhere,TX,67890
-3,Alice Johnson,alice.johnson@example.com,789 Pine St,Elsewhere,NY,11223
+id,name,email,street,city,state,non_pii
+1,John Doe,john.doe@example.com,123 Main St,Anytown,CA,reallynotpii
+2,Jane Smith,jane.smith@example.com,456 Elm St,Somewhere,TX,reallynotapii
+3,Alice Johnson,alice.johnson@example.com,789 Pine St,Elsewhere,NY,reallynotapiiatall