Skip to content

Commit

Permalink
Merge branch 'main' into quarter_func
Browse files Browse the repository at this point in the history
  • Loading branch information
joxssb authored Dec 17, 2024
2 parents 3087b58 + 813aa45 commit 651534a
Show file tree
Hide file tree
Showing 23 changed files with 3,051 additions and 2,105 deletions.
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
"commit": "be07b1714e102b263e86c5f6f5578af4db38a03e",
"checkout": null,
"commit": "364d8a1371f3eefd7228f0189126db6ba96e76ee",
"checkout": "2024.11.26",
"context": {
"cookiecutter": {
"project_name": "ssb-konjunk",
Expand Down
73 changes: 73 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: "\U0001F41E Bug Report"
description: Report a bug
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
Please fill out the sections below to help everyone identify and fix the bug
- type: textarea
id: description
attributes:
label: Describe the bug
placeholder: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: reproduce
attributes:
label: To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. Step 1...
2. Step 2...
3. Step 3...
4. Step 4...
validations:
required: false
- type: textarea
id: expected
attributes:
label: Expected behaviour
placeholder: A clear and concise description of what you expected to happen.
validations:
required: false
- type: dropdown
id: platform
attributes:
label: Platforms and Environments
multiple: true
description: >
On which platforms does the bug occur?
The first four items are platforms in Statistics Norway.
You can select multiple platforms.
options:
- DaplaLab with vscode
- DaplaLab with Jupyter
- Jupyter on-prem
- Old Dapla with Jupyter
- Windows
- Linux
- macOS
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: What version of our software are you running?
placeholder: 1.0.0
validations:
required: false
- type: textarea
id: logs
attributes:
label: Error messages or logs
description: Please copy and paste any relevant log output or error messages.
render: shell
validations:
required: false
- type: markdown
attributes:
value: |
Thanks for reporting this issue! We will get back to you as soon as possible.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "\U0001F381 Feature Request"
description: Suggest a new feature or enhancment.
labels: ["enhancement"]
body:
- type: textarea
id: description
attributes:
label: Description
description: >
Describe the feature or enhancement and explain why it should be implemented.
Include a code example if applicable.
validations:
required: true
- type: markdown
attributes:
value: |
Thanks for reporting this issue! We will get back to you as soon as possible.
8 changes: 4 additions & 4 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pip==24.0
nox==2024.3.2
pip==24.3.1
nox==2024.10.9
nox-poetry==1.0.3
poetry==1.8.2
virtualenv==20.25.1
poetry==1.8.4
virtualenv==20.28.0
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
poetry --version
- name: Set up Python
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5.3.0
with:
python-version: "3.12"
cache: "poetry"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
uses: actions/checkout@v4

- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v5.0.0
uses: crazy-max/ghaction-github-labeler@v5.1.0
with:
skip-delete: true
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fetch-depth: 2

- name: Set up Python
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5.3.0
with:
python-version: "3.12"

Expand Down Expand Up @@ -61,11 +61,11 @@ jobs:
- name: Publish package on PyPI
if: steps.check-version.outputs.tag
uses: pypa/gh-action-pypi-publish@v1.8.14
uses: pypa/gh-action-pypi-publish@v1.12.2

- name: Publish package on TestPyPI
if: (!steps.check-version.outputs.tag)
uses: pypa/gh-action-pypi-publish@v1.8.14
uses: pypa/gh-action-pypi-publish@v1.12.2
with:
repository-url: https://test.pypi.org/legacy/

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ matrix.python }}

Expand Down Expand Up @@ -102,6 +102,7 @@ jobs:
with:
name: coverage-data-${{ matrix.os }}-${{ matrix.python }}
path: ".coverage.*"
include-hidden-files: true

- name: Upload documentation
if: matrix.session == 'docs-build'
Expand All @@ -120,7 +121,7 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up Python
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5.3.0
with:
python-version: "3.12"

Expand Down Expand Up @@ -167,4 +168,4 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# No need to run SonarCloud analysis if dependabot update or token not defined
if: env.SONAR_TOKEN != '' && (github.actor != 'dependabot[bot]')
uses: SonarSource/sonarcloud-github-action@v2.1.1
uses: SonarSource/sonarcloud-github-action@v3.1.0
24 changes: 9 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
*.xlsx
*.zip

# Notebooks shall be stored in .py or .R-format.
# See https://adr.ssb.no/0020-lagringsformat-for-jupyter-notebooks/
*.ipynb


# The section below is from the GitHub .gitignore template for Python:
# https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore

Expand Down Expand Up @@ -204,18 +209,7 @@ rsconnect/

# ignore poetry in .config
.poetry/**
/.python-version
/.pytype/
/docs/_build/

# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix

# Blaise specific ignores
*.bdix
*.bdbx
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,16 @@ repos:
entry: end-of-file-fixer
language: system
types: [text]
stages: [commit, push, manual]
- id: trailing-whitespace
name: Trim Trailing Whitespace
entry: trailing-whitespace-fixer
language: system
types: [text]
stages: [commit, push, manual]
- id: mixed-line-ending
name: Mixed Line Ending
entry: mixed-line-ending
language: system
types: [text]
stages: [commit, push, manual]

# Serialization format checkers
- id: check-yaml
Expand Down Expand Up @@ -65,7 +62,6 @@ repos:
entry: darglint
language: system
types: [python]
stages: [manual]
- id: ruff
name: ruff
entry: ruff check --fix --exit-non-zero-on-fix
Expand Down
16 changes: 16 additions & 0 deletions docs/ssb_konjunk.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ ssb\_konjunk.prompts module
:undoc-members:
:show-inheritance:

ssb\_konjunk.rounding module
----------------------------

.. automodule:: ssb_konjunk.rounding
:members:
:undoc-members:
:show-inheritance:

ssb\_konjunk.saving module
--------------------------

Expand All @@ -34,6 +42,14 @@ ssb\_konjunk.saving module
:undoc-members:
:show-inheritance:

ssb\_konjunk.statbank\_format module
------------------------------------

.. automodule:: ssb_konjunk.statbank_format
:members:
:undoc-members:
:show-inheritance:

ssb\_konjunk.timestamp module
-----------------------------

Expand Down
Loading

0 comments on commit 651534a

Please sign in to comment.