Skip to content

Commit 7a42f14

Browse files
committed
sync with recent changes to resolve conflicts
2 parents f8a77ab + 8da2ec5 commit 7a42f14

File tree

62 files changed

+9654
-5884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+9654
-5884
lines changed

.github/workflows/DockerBuild.AzureFunctionsBaseImage.yaml

Lines changed: 0 additions & 73 deletions
This file was deleted.

.github/workflows/DockerBuild.LambdaBaseImage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
version:
1212
description: "Version of ArcGIS API for Python to install in the image"
1313
type: string
14-
default: "2.3.1"
14+
default: "2.4.1"
1515
python_version:
1616
description: "Python version to base image on"
1717
type: string

.github/workflows/DockerBuild.NotebookImage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
version:
1212
description: "Version of ArcGIS API for Python to install in the image"
1313
type: string
14-
default: "2.3.1"
14+
default: "2.4.1"
1515
python_version:
1616
description: "Python version to base image on"
1717
type: string
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This workflow creates samples.zip from samples directory
2+
# and uploads it automatically to the release when it is published
3+
name: Release - Upload samples.zip
4+
5+
on:
6+
release:
7+
types:
8+
# published is triggered when a release is created without a draft
9+
# or a draft is published
10+
- published
11+
12+
jobs:
13+
upload-samples:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
- name: Create samples.zip
20+
run: |
21+
zip -r samples.zip samples
22+
- name: Upload samples.zip to release
23+
uses: softprops/action-gh-release@v2
24+
with:
25+
files: |
26+
samples.zip

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ guide/gis module/.ipynb_checkpoints/class gis.ContentManager-checkpoint.ipynb
22
.ipynb_checkpoints
33
.idea/
44
.DS_Store
5+
pixi.lock

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"ms-azuretools.vscode-azurefunctions",
4+
"ms-python.python"
5+
]
6+
}

.vscode/launch.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Attach to Python Functions",
6+
"type": "debugpy",
7+
"request": "attach",
8+
"connect": {
9+
"host": "localhost",
10+
"port": 9091
11+
},
12+
"preLaunchTask": "func: host start"
13+
}
14+
]
15+
}

.vscode/settings.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"azureFunctions.deploySubpath": "samples/devops_azure_functions",
3+
"azureFunctions.scmDoBuildDuringDeployment": true,
4+
"azureFunctions.pythonVenv": ".venv",
5+
"azureFunctions.projectLanguage": "Python",
6+
"azureFunctions.projectRuntime": "~4",
7+
"debug.internalConsoleOptions": "neverOpen",
8+
"azureFunctions.projectLanguageModel": 2,
9+
"azureFunctions.projectSubpath": "samples/devops_azure_functions"
10+
}

.vscode/tasks.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "func",
6+
"label": "func: host start",
7+
"command": "host start",
8+
"problemMatcher": "$func-python-watch",
9+
"isBackground": true,
10+
"dependsOn": "pip install (functions)",
11+
"options": {
12+
"cwd": "${workspaceFolder}/samples/devops_azure_functions"
13+
}
14+
},
15+
{
16+
"label": "pip install (functions)",
17+
"type": "shell",
18+
"osx": {
19+
"command": "${config:azureFunctions.pythonVenv}/bin/python -m pip install -r requirements.txt"
20+
},
21+
"windows": {
22+
"command": "${config:azureFunctions.pythonVenv}\\Scripts\\python -m pip install -r requirements.txt"
23+
},
24+
"linux": {
25+
"command": "${config:azureFunctions.pythonVenv}/bin/python -m pip install -r requirements.txt"
26+
},
27+
"problemMatcher": [],
28+
"options": {
29+
"cwd": "${workspaceFolder}/samples/devops_azure_functions"
30+
}
31+
}
32+
]
33+
}

docker/AzureFunctionsBaseImage.Dockerfile

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)