Skip to content

Commit 98a83f5

Browse files
authored
Merge pull request #80 from statisticsnorway/bg-proofing-loc-methods-for-pandas-3
Bg proofing loc methods for pandas 3
2 parents 50c4aea + 3cc91fe commit 98a83f5

12 files changed

+1763
-1408
lines changed

.cruft.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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-model-solver",
88
"package_name": "model_solver",
99
"friendly_name": "SSB Model Solver",
1010
"copyright_owner": "Statistics Norway",
1111
"copyright_year": "2024",
12-
"author": "Benedikt Goodman",
12+
"author": "Magnus Helliesen, Benedikt Goodman",
1313
"email": "[email protected]",
1414
"github_organization": "statisticsnorway",
1515
"version": "1.1.23",
@@ -23,7 +23,8 @@
2323
"lstrip_blocks": true,
2424
"trim_blocks": true
2525
},
26-
"_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git"
26+
"_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
27+
"_commit": "66884cffa5aa67ed505bb121009501b51cc4d847"
2728
}
2829
},
2930
"directory": null

.github/ISSUE_TEMPLATE/bug_report.yml

+73
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.
+17
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pip==24.2
2-
nox==2024.4.15
1+
pip==24.3.1
2+
nox==2024.10.9
33
nox-poetry==1.0.3
4-
poetry==1.8.3
5-
virtualenv==20.26.3
4+
poetry==2.0.1
5+
virtualenv==20.28.1

.github/workflows/docs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ 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
37-
uses: actions/setup-python@v5.2.0
38+
uses: actions/setup-python@v5.3.0
3839
with:
3940
python-version: "3.12"
4041
cache: "poetry"

.github/workflows/labeler.yml

+1-1
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/[email protected]
23+
uses: crazy-max/[email protected] # 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

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fetch-depth: 2
2222

2323
- name: Set up Python
24-
uses: actions/setup-python@v5.2.0
24+
uses: actions/setup-python@v5.3.0
2525
with:
2626
python-version: "3.12"
2727

@@ -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.10.1
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.10.1
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

+6-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@v4
3838

3939
- name: Set up Python ${{ matrix.python }}
40-
uses: actions/setup-python@v5.2.0
40+
uses: actions/setup-python@v5.3.0
4141
with:
4242
python-version: ${{ matrix.python }}
4343

@@ -58,6 +58,7 @@ jobs:
5858
- name: Install Poetry
5959
run: |
6060
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
61+
pipx inject poetry poetry-plugin-export
6162
poetry --version
6263
6364
- name: Install Nox
@@ -120,9 +121,9 @@ jobs:
120121
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
121122

122123
- name: Set up Python
123-
uses: actions/setup-python@v5.2.0
124+
uses: actions/setup-python@v5.3.0
124125
with:
125-
python-version: "3.12"
126+
python-version: "3.10"
126127

127128
- name: Upgrade pip
128129
run: |
@@ -132,6 +133,7 @@ jobs:
132133
- name: Install Poetry
133134
run: |
134135
pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
136+
pipx inject poetry poetry-plugin-export
135137
poetry --version
136138
137139
- name: Install Nox
@@ -167,4 +169,4 @@ jobs:
167169
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
168170
# No need to run SonarCloud analysis if dependabot update or token not defined
169171
if: env.SONAR_TOKEN != '' && (github.actor != 'dependabot[bot]')
170-
uses: SonarSource/sonarcloud-github-action@v3.0.0
172+
uses: SonarSource/sonarcloud-github-action@v3.1.0

.pre-commit-config.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,16 @@ repos:
2323
entry: end-of-file-fixer
2424
language: system
2525
types: [text]
26-
stages: [commit, push, manual]
2726
- id: trailing-whitespace
2827
name: Trim Trailing Whitespace
2928
entry: trailing-whitespace-fixer
3029
language: system
3130
types: [text]
32-
stages: [commit, push, manual]
3331
- id: mixed-line-ending
3432
name: Mixed Line Ending
3533
entry: mixed-line-ending
3634
language: system
3735
types: [text]
38-
stages: [commit, push, manual]
3936

4037
# Serialization format checkers
4138
- id: check-yaml
@@ -65,7 +62,6 @@ repos:
6562
entry: darglint
6663
language: system
6764
types: [python]
68-
stages: [manual]
6965
- id: ruff
7066
name: ruff
7167
entry: ruff check --fix --exit-non-zero-on-fix

0 commit comments

Comments
 (0)