Skip to content

Commit 5c4ac40

Browse files
authored
Merge pull request #130 from statisticsnorway/cruft-update
Update to template version 2025.1.14 and rename time.py
2 parents f81f36b + d81bfcd commit 5c4ac40

File tree

16 files changed

+1772
-1670
lines changed

16 files changed

+1772
-1670
lines changed

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
3-
"commit": "e6f0ca2794354d16838cf36d97bee2f9f70d3142",
4-
"checkout": "2024.9.10",
3+
"commit": "66884cffa5aa67ed505bb121009501b51cc4d847",
4+
"checkout": "2025.1.14",
55
"context": {
66
"cookiecutter": {
77
"project_name": "ssb-fagfunksjoner",
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: "\U0001F41E Bug Report"
2+
description: Report a bug
3+
labels: ["bug"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Please fill out the sections below to help everyone identify and fix the bug
9+
- type: textarea
10+
id: description
11+
attributes:
12+
label: Describe the bug
13+
placeholder: A clear and concise description of what the bug is.
14+
validations:
15+
required: true
16+
- type: textarea
17+
id: reproduce
18+
attributes:
19+
label: To Reproduce
20+
description: Steps to reproduce the behavior.
21+
placeholder: |
22+
1. Step 1...
23+
2. Step 2...
24+
3. Step 3...
25+
4. Step 4...
26+
validations:
27+
required: false
28+
- type: textarea
29+
id: expected
30+
attributes:
31+
label: Expected behaviour
32+
placeholder: A clear and concise description of what you expected to happen.
33+
validations:
34+
required: false
35+
- type: dropdown
36+
id: platform
37+
attributes:
38+
label: Platforms and Environments
39+
multiple: true
40+
description: >
41+
On which platforms does the bug occur?
42+
The first four items are platforms in Statistics Norway.
43+
You can select multiple platforms.
44+
options:
45+
- DaplaLab with vscode
46+
- DaplaLab with Jupyter
47+
- Jupyter on-prem
48+
- Old Dapla with Jupyter
49+
- Windows
50+
- Linux
51+
- macOS
52+
validations:
53+
required: true
54+
- type: input
55+
id: version
56+
attributes:
57+
label: Version
58+
description: What version of our software are you running?
59+
placeholder: 1.0.0
60+
validations:
61+
required: false
62+
- type: textarea
63+
id: logs
64+
attributes:
65+
label: Error messages or logs
66+
description: Please copy and paste any relevant log output or error messages.
67+
render: shell
68+
validations:
69+
required: false
70+
- type: markdown
71+
attributes:
72+
value: |
73+
Thanks for reporting this issue! We will get back to you as soon as possible.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: "\U0001F381 Feature Request"
2+
description: Suggest a new feature or enhancment.
3+
labels: ["enhancement"]
4+
body:
5+
- type: textarea
6+
id: description
7+
attributes:
8+
label: Description
9+
description: >
10+
Describe the feature or enhancement and explain why it should be implemented.
11+
Include a code example if applicable.
12+
validations:
13+
required: true
14+
- type: markdown
15+
attributes:
16+
value: |
17+
Thanks for reporting this issue! We will get back to you as soon as possible.

.github/workflows/constraints.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pip==24.3.1
22
nox==2024.10.9
33
nox-poetry==1.0.3
4-
poetry==1.8.4
5-
virtualenv==20.27.1
4+
poetry==2.0.1
5+
virtualenv==20.28.1

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
- name: Install Poetry
3232
run: |
3333
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
34+
pipx inject poetry poetry-plugin-export
3435
poetry --version
3536
3637
- name: Set up Python

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
uses: actions/checkout@v4
2121

2222
- name: Run Labeler
23-
uses: crazy-max/ghaction-github-labeler@v5.1.0
23+
uses: crazy-max/ghaction-github-labeler@v5.0.0 # Use this version until https://github.com/crazy-max/ghaction-github-labeler/issues/221 is fixed
2424
with:
2525
skip-delete: true

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
3333
- name: Install Poetry
3434
run: |
35-
pip install -c ${{ github.workspace }}/.github/workflows/constraints.txt poetry
35+
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
36+
pipx inject poetry poetry-plugin-export
3637
poetry --version
3738
3839
- name: Check if there is a parent commit
@@ -61,11 +62,11 @@ jobs:
6162
6263
- name: Publish package on PyPI
6364
if: steps.check-version.outputs.tag
64-
uses: pypa/gh-action-pypi-publish@v1.11.0
65+
uses: pypa/gh-action-pypi-publish@v1.12.3
6566

6667
- name: Publish package on TestPyPI
6768
if: (!steps.check-version.outputs.tag)
68-
uses: pypa/gh-action-pypi-publish@v1.11.0
69+
uses: pypa/gh-action-pypi-publish@v1.12.3
6970
with:
7071
repository-url: https://test.pypi.org/legacy/
7172

.github/workflows/tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
- name: Install Poetry
6161
run: |
6262
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
63+
pipx inject poetry poetry-plugin-export
6364
poetry --version
6465
6566
- name: Install Nox
@@ -124,7 +125,7 @@ jobs:
124125
- name: Set up Python
125126
uses: actions/setup-python@v5.3.0
126127
with:
127-
python-version: "3.12"
128+
python-version: "3.10"
128129

129130
- name: Upgrade pip
130131
run: |
@@ -134,6 +135,7 @@ jobs:
134135
- name: Install Poetry
135136
run: |
136137
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
138+
pipx inject poetry poetry-plugin-export
137139
poetry --version
138140
139141
- name: Install Nox

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ repos:
6767
entry: darglint
6868
language: system
6969
types: [python]
70-
stages: [manual]
7170
- id: ruff
7271
name: ruff
7372
entry: ruff check --fix --exit-non-zero-on-fix

0 commit comments

Comments
 (0)