Skip to content

Commit 3640f1d

Browse files
committed
Per #428, resolving conflicts from merging.
2 parents f5b86cf + 72daaec commit 3640f1d

66 files changed

Lines changed: 2685 additions & 390 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/benchmark_pandas3x.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
echo "Finished benchmark for pandas 2.2"
8080
8181
# - name: Archive benchmark results
82-
# uses: actions/upload-artifact@v4
82+
# uses: actions/upload-artifact@v7
8383
# with:
8484
# name: benchmark-report
8585
# path: /home/runner/work/METdataio/METdatio/METreformat/test/**

.github/workflows/documentation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
- name: Install dependencies
2626
run: |
2727
python -m pip install --upgrade python-dateutil requests sphinx \
28-
sphinx-gallery Pillow sphinx_rtd_theme sphinx-design
28+
sphinx-gallery Pillow sphinx_rtd_theme sphinx-panels
2929
python -m pip install -r docs/requirements.txt
3030
- name: Build docs
3131
run: ./.github/jobs/build_documentation.sh
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v7
3333
if: always()
3434
with:
3535
name: documentation
3636
path: artifact/documentation
37-
- uses: actions/upload-artifact@v4
37+
- uses: actions/upload-artifact@v7
3838
if: failure()
3939
with:
4040
name: documentation_warnings.log

.github/workflows/linkcheck.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Linkcheck
2+
on:
3+
schedule:
4+
- cron: '0 6 * * 1'
5+
pull_request:
6+
paths:
7+
- 'docs/**'
8+
workflow_dispatch: {}
9+
10+
jobs:
11+
linkcheck:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v6
15+
- uses: dtcenter/metplus-action-linkcheck@v1
16+
with:
17+
fail-on-broken-links: 'true'
18+
upload-artifact: 'true'
19+
install-package: 'true'

.github/workflows/main.yaml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/unit_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ on:
2727

2828
jobs:
2929
build:
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-latest
3131

3232
services:
3333
mariadb:
3434
image: mariadb:latest
3535
env:
3636
MARIADB_ROOT_PASSWORD: root_password
37+
3738
ports:
3839
- 3306:3306
3940
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -73,7 +74,6 @@ jobs:
7374
# run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
7475
# id: extract_branch
7576

76-
7777
- name: Test with pytest
7878
run: |
7979
coverage run --append -m pytest

METdbLoad/conftest.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
from METdataio.METdbLoad.ush.run_sql import RunSql
99
from METdataio.METdbLoad.test.utils import (
1010
get_xml_test_file,
11-
POINT_STAT_DATA_DIR
11+
POINT_STAT_DATA_DIR,
12+
VSDB_NO_EQUALS_DIR,
13+
VSDB_DATA_DIR,
14+
VSDB_DIR,
1215
)
13-
from METdbLoad.ush.read_load_xml import XmlLoadFile
16+
from METdataio.METdbLoad.ush.read_load_xml import XmlLoadFile
1417

1518
# add METdataio directory to path so packages can be found
1619
TOP_DIR = str(Path(__file__).parents[1])
@@ -126,6 +129,19 @@ def load_and_read_xml(
126129

127130
return load_and_read_xml
128131

132+
@pytest.fixture
133+
def get_generic_xml_loadfile():
134+
def load_and_read_xml(
135+
tmp_path, data_dir, met_tool
136+
):
137+
from METdataio.METdbLoad.ush.read_load_xml import XmlLoadFile
138+
139+
XML_FILE = get_xml_test_file(tmp_path, data_dir, met_tool)
140+
XML_LOADFILE = XmlLoadFile(XML_FILE)
141+
XML_LOADFILE.read_xml()
142+
return XML_LOADFILE
143+
144+
return load_and_read_xml
129145

130146
@pytest.fixture
131147
def mock_logger():

METdbLoad/test/data/empty/empty.stat

Whitespace-only changes.

METdbLoad/test/data/empty/empty_mode/empty_mode_cts.txt

Whitespace-only changes.

METdbLoad/test/data/empty/empty_mode/empty_mode_obj.txt

Whitespace-only changes.

METdbLoad/test/data/empty/empty_mode_cts/empty_mode_cts.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)