Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/dot-github/workflows/workflow…
Browse files Browse the repository at this point in the history
…s-dependencies-9615ce233e
  • Loading branch information
joxssb authored Nov 27, 2024
2 parents cbaa007 + 8576e0c commit dc2fd9b
Show file tree
Hide file tree
Showing 25 changed files with 4,128 additions and 238 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": "e6f0ca2794354d16838cf36d97bee2f9f70d3142",
"checkout": "2024.9.10",
"context": {
"cookiecutter": {
"project_name": "ssb-konjunk",
Expand Down
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.2.0
with:
python-version: "3.12"
cache: "poetry"
Expand Down
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.2.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.10.1

- 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.10.1
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.2.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.2.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.0.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
46 changes: 43 additions & 3 deletions docs/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,18 @@ ssb\_konjunk package
====================
ssb\_konjunk.functions module
-----------------------------
ssb\_konjunk.data\_formating module
-----------------------------------
.. automodule:: ssb_konjunk.functions
.. automodule:: ssb_konjunk.data_formating
:members:
:undoc-members:
:show-inheritance:
ssb\_konjunk.fame module
------------------------
.. automodule:: ssb_konjunk.fame
:members:
:undoc-members:
:show-inheritance:
Expand All @@ -31,3 +39,35 @@ ssb\_konjunk.prompts module
:members:
:undoc-members:
:show-inheritance:
ssb\_konjunk.saving module
--------------------------
.. automodule:: ssb_konjunk.saving
:members:
:undoc-members:
:show-inheritance:
ssb\_konjunk.timestamp module
-----------------------------
.. automodule:: ssb_konjunk.timestamp
:members:
:undoc-members:
:show-inheritance:
ssb\_konjunk.xml\_handling module
---------------------------------
.. automodule:: ssb_konjunk.xml_handling
:members:
:undoc-members:
:show-inheritance:
Module contents
---------------
.. automodule:: ssb_konjunk
:members:
:undoc-members:
:show-inheritance:
67 changes: 67 additions & 0 deletions docs/ssb_konjunk.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
ssb\_konjunk package
====================


ssb\_konjunk.data\_formating module
-----------------------------------

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

ssb\_konjunk.fame module
------------------------

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

ssb\_konjunk.prompts module
---------------------------

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

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

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

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

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

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

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

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

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

ssb\_konjunk.xml\_handling module
---------------------------------

.. automodule:: ssb_konjunk.xml_handling
:members:
:undoc-members:
:show-inheritance:
Loading

0 comments on commit dc2fd9b

Please sign in to comment.