Merge pull request #56 from swisstopo/develop

v3.9.4

.github/workflows/build.yaml

@@ -1,4 +1,4 @@
-name: build
+name: Generate markdown and PDF documents
 
 
 on:
@@ -31,8 +31,7 @@ jobs:
       - name: Install miniconda
         uses: conda-incubator/setup-miniconda@v3
         with:
-          python-version: 3.12.3
-          mamba-version: "*"
+          python-version: 3.12
           channels: conda-forge,defaults
           channel-priority: true
           activate-environment: DATAMODEL
@@ -48,40 +47,43 @@ jobs:
 
 
       - shell: bash -el {0}
-        run: make markdown
+        run: pip install -e .
 
       - shell: bash -el {0}
         run: |
-          python ./datamodel.py  --lang de
-          python ./datamodel.py  --lang fr
           python ./create_gv.py
     
       - name: Build all targets
         shell: bash -el {0}
-        run: make cleanall babel markdown docs
+        run: make cleanall all
       - name: Generate PlantUML Diagrams
         uses: rotaract/plantuml-action@v1
         with:
           format: svg
-          pattern: output/ER-GCOVER.puml
+          pattern: outputs/ER-GCOVER.puml
 
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: document-artifacts
           path: |
-            output/datamodel_de.pdf
-            output/datamodel_fr.pdf 
-            output/datamodel_de.docx
-            output/datamodel_fr.docx
-            output/datamodel_fr.html
-            output/datamodel_de.html
-            output/datamodel.css
-            output/geocover.png
-            output/ER-GCOVER.svg
-            output/ER-GCOVER.pdf
+            outputs/de/datamodel.pdf
+            outputs/fr/datamodel.pdf
+            outputs/de/datamodel.docx
+            outputs/fr/datamodel.docx
+            outputs/fr/datamodel.html
+            outputs/de/datamodel.html
+            outputs/de/datamodel.css
+            outputs/fr/datamodel.css
+            outputs/de/geocover.png
+            outputs/fr/geocover.png
+            outputs/ER-GCOVER.svg
+            outputs/ER-GCOVER.pdf
+            outputs/geocover-schema-sde.png
+            outputs/geocover-schema-sde.svg
             exports/coded_domains.xlsx
             exports/all_geolcode.xlsx
             exports/all_geolcode.json
+            exports/geocover-schema-sde.json
 

.github/workflows/deploy.yaml

@@ -1,4 +1,4 @@
-name: Upload to S3
+name: Upload artifacts to S3
 
 
 
@@ -29,5 +29,5 @@ jobs:
         AWS_REGION: 'eu-central-1'
         S3_BUCKET: ${{ secrets.AWS_BUCKET }}
         S3_KEY: 'datamodel'
-        FILE: './output'
+        FILE: './outputs'
 

.github/workflows/geocover.yaml

@@ -0,0 +1,60 @@
+name: Build conda and pip packages
+
+
+on:
+  workflow_call:
+  push:
+    branches:
+      - master
+      - 'releases/**'
+  pull_request:
+    branches:
+      - master
+      - develop
+      - 'releases/**'
+
+
+jobs:
+  build-markdown:
+    name: Build conda and pip packages
+    runs-on: "ubuntu-latest"
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install miniconda
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: 3.12
+          channels: conda-forge,defaults
+          channel-priority: true
+          activate-environment: DATAMODEL
+          environment-file: environment.yaml
+
+      - name: conda install
+        shell: bash -el {0}
+        run: $CONDA/bin/conda install conda-build anaconda-client -y
+
+      - name: Check conda installation
+        shell: bash -el {0}
+        run: |
+          conda info
+          conda list
+          conda config --show-sources
+          conda config --show
+          printenv | sort
+
+      - name: conda build
+        shell: bash -el {0}
+        run: |
+          $CONDA/bin/conda build --output-folder  ./conda-out/  recipe
+    
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: conda-package
+          path: |
+            conda-out/noarch/geocover*.tar.bz2
+
+

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Uploading release assets
+name: Uploading assets to GitHub release
 
 
 on:
@@ -25,12 +25,15 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.TOKEN }}
         with:
           files: |
-            output/datamodel_de.pdf
-            output/datamodel_fr.pdf
-            output/datamodel_de.docx
-            output/datamodel_fr.docx
-            output/ER-GCOVER.svg
-            output/ER-GCOVER.pdf
+            outputs/de/datamodel.pdf
+            outputs/fr/datamodel.pdf
+            outputs/de/datamodel.docx
+            outputs/fr/datamodel.docx
+            outputs/ER-GCOVER.svg
+            outputs/ER-GCOVER.pdf
             exports/coded_domains.xlsx
             exports/all_geolcode.xlsx
+            exports/geocover-schema-sde.json
+            outputs/geocover-schema-sde.png
+            outputs/geocover-schema-sde.svg
 

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 
 .idea
 output/Thumbs.db
+*.egg-info
 

LICENSE.txt

@@ -0,0 +1,19 @@
+BSD 3-Clause License
+
+Copyright (c) 2024, swisstopo
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE.txt
+include VERSION
+include README.md
+include setup.py