Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into experimental/cbi-va…
Browse files Browse the repository at this point in the history
…riables-tab
  • Loading branch information
tilen1976 committed Jan 15, 2024
2 parents ac89d76 + 6eb37a6 commit 0912e1e
Show file tree
Hide file tree
Showing 112 changed files with 5,043 additions and 3,663 deletions.
22 changes: 22 additions & 0 deletions .cookiecutter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"_copy_without_render": [
"*.rst_t"
],
"_jinja2_env_vars": {
"lstrip_blocks": true,
"trim_blocks": true
},
"_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
"author": "Miles Winther",
"code_quality_level": "High",
"copyright_owner": "Statistics Norway",
"copyright_year": "2022",
"development_status": "Development Status :: 4 - Beta",
"email": "[email protected]",
"friendly_name": "Datadoc",
"github_organization": "statisticsnorway",
"license": "MIT",
"package_name": "datadoc",
"project_name": "datadoc",
"version": "0.4.0"
}
30 changes: 30 additions & 0 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
"commit": "ade308e2279e8de90c4ba67d8148e984b3465d36",
"checkout": "2023.12.11",
"context": {
"cookiecutter": {
"project_name": "datadoc",
"package_name": "datadoc",
"friendly_name": "Datadoc",
"copyright_owner": "Statistics Norway",
"copyright_year": "2022",
"author": "Miles Winther",
"email": "[email protected]",
"github_organization": "statisticsnorway",
"version": "0.4.0",
"license": "MIT",
"development_status": "Development Status :: 4 - Beta",
"code_quality_level": "High",
"_copy_without_render": [
"*.rst_t"
],
"_jinja2_env_vars": {
"lstrip_blocks": true,
"trim_blocks": true
},
"_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git"
}
},
"directory": null
}
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{py,toml}]
indent_style = space
indent_size = 4

[*.yml,yaml,json]
indent_style = space
indent_size = 2
32 changes: 32 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 99
groups:
github-action-dependencies:
patterns:
- "*"
- package-ecosystem: "pip"
directory: "/.github/workflows"
schedule:
interval: "monthly"
open-pull-requests-limit: 99
groups:
workflows-dependencies:
patterns:
- "*"
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "monthly"
versioning-strategy: lockfile-only
allow:
- dependency-type: "all"
open-pull-requests-limit: 99
groups:
poetry-dependencies:
patterns:
- "*"
66 changes: 66 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
---
# Labels names are important as they are used by Release Drafter to decide
# regarding where to record them in changelog or if to skip them.
#
# The repository labels will be automatically configured using this file and
# the GitHub Action https://github.com/marketplace/actions/github-labeler.
- name: breaking
description: Breaking Changes
color: bfd4f2
- name: bug
description: Something isn't working
color: d73a4a
- name: ci
description: Continuous Integration
color: 4a97d6
- name: dependencies
description: Pull requests that update a dependency file
color: 0366d6
- name: documentation
description: Improvements or additions to documentation
color: 0075ca
- name: duplicate
description: This issue or pull request already exists
color: cfd3d7
- name: enhancement
description: New feature or request
color: a2eeef
- name: github_actions
description: Pull requests that update Github_actions code
color: "000000"
- name: good first issue
description: Good for newcomers
color: 7057ff
- name: help wanted
description: Extra attention is needed
color: 008672
- name: invalid
description: This doesn't seem right
color: e4e669
- name: performance
description: Performance
color: "016175"
- name: python
description: Pull requests that update Python code
color: 2b67c6
- name: question
description: Further information is requested
color: d876e3
- name: refactoring
description: Refactoring
color: ef67c4
- name: removal
description: Removals and Deprecations
color: 9ae7ea
- name: style
description: Style
color: c120e5
- name: testing
description: Testing
color: b1fc6f
- name: wontfix
description: This will not be worked on
color: ffffff
- name: "skip-changelog"
description: Changes that should be omitted from the release notes
color: ededed
30 changes: 30 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
categories:
- title: ":boom: Breaking Changes"
label: "breaking"
- title: ":rocket: Features"
label: "enhancement"
- title: ":fire: Removals and Deprecations"
label: "removal"
- title: ":beetle: Fixes"
label: "bug"
- title: ":racehorse: Performance"
label: "performance"
- title: ":rotating_light: Testing"
label: "testing"
- title: ":construction_worker: Continuous Integration"
label: "ci"
- title: ":books: Documentation"
label: "documentation"
- title: ":hammer: Refactoring"
label: "refactoring"
- title: ":lipstick: Style"
label: "style"
- title: ":package: Dependencies"
labels:
- "dependencies"
exclude-labels:
- "skip-changelog"
template: |
## Changes
$CHANGES
5 changes: 5 additions & 0 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pip==23.3.1
nox==2023.4.22
nox-poetry==1.0.3
poetry==1.7.1
virtualenv==20.25.0
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
name: Datadoc Dapla Lab CI
name: Docker build

on:
push:
branches:
- "**"
paths:
- 'datadoc/**'
- 'poetry.lock'
- 'Dockerfile'
- '.github/workflows/dapla-lab-ci.yml'
tags:
- "*"
pull_request:
paths:
- 'datadoc/**'
- 'src/datadoc/**'
- 'poetry.lock'
- 'Dockerfile'
- '.github/workflows/dapla-lab-ci.yml'
- '.github/workflows/docker-build.yml'

env:
REGISTRY: europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia
REGISTRY: europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-metadata-docker/datadoc
IMAGE: datadoc
TAG: ${{ github.ref_name }}-${{ github.sha }}

Expand All @@ -36,7 +30,7 @@ jobs:
uses: "google-github-actions/[email protected]"
with:
workload_identity_provider: "projects/848539402404/locations/global/workloadIdentityPools/gh-actions/providers/gh-actions"
service_account: "gh-actions-dapla-lab@artifact-registry-5n.iam.gserviceaccount.com"
service_account: "gh-actions-dapla-metadata@artifact-registry-5n.iam.gserviceaccount.com"
token_format: "access_token"
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Documentation

on:
push:
branches:
- main
- master

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@v4

- name: Install Poetry
run: |
pipx install --pip-args "-c .github/workflows/constraints.txt" poetry
poetry --version
- name: Set up Python
uses: actions/[email protected]
with:
python-version: "3.11"
cache: "poetry"

- name: Install dependencies
run: |
poetry install --no-root
- name: Build doc with Sphinx
run: |
poetry run sphinx-build -W docs docs/_build
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
with:
path: "docs/_build"

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Setup Pages
uses: actions/configure-pages@v4

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
25 changes: 25 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Labeler

on:
push:
branches:
- main
- master
paths:
- ".github/labels.yml"
- ".github/workflows/labeler.yml"

jobs:
labeler:
runs-on: ubuntu-latest
permissions:
issues: write
contents: read
steps:
- name: Check out the repository
uses: actions/checkout@v4

- name: Run Labeler
uses: crazy-max/[email protected]
with:
skip-delete: true
16 changes: 0 additions & 16 deletions .github/workflows/publish.yml

This file was deleted.

Loading

0 comments on commit 0912e1e

Please sign in to comment.