Skip to content

Commit c12ca48

Browse files
authored
Merge pull request #102 from Samweli/changelog
Page for changelog in the documentation
2 parents 122e06f + 022605c commit c12ca48

File tree

6 files changed

+57
-38
lines changed

6 files changed

+57
-38
lines changed

CHANGELOG.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
# Changelog
22

3-
## [Draft]
43

5-
## [1.0.0] - 2021-11-15
4+
## [Unreleased]
65

7-
### New changes
8-
- Plugin skeleton
6+
### 1.0.0-pre 2022-01-11
7+
- Changed loading and downloading assets workflow [#93](https://github.com/stac-utils/qgis-stac-plugin/pull/93).
8+
- Implemented testing connection functionality.
9+
- Reworked filter and sort features on the search item results.
10+
- Fetch for STAC API conformance classes [#82](https://github.com/stac-utils/qgis-stac-plugin/pull/82).
11+
- Added STAC API signing using SAS token [#79](https://github.com/stac-utils/qgis-stac-plugin/pull/79).
12+
- Support for downloading assets and loading item footprints in QGIS, [#70](https://github.com/stac-utils/qgis-stac-plugin/pull/70).
13+
- Enabled adding STAC item assets as map layers in QGIS [#58](https://github.com/stac-utils/qgis-stac-plugin/pull/58).
14+
- Added plugin documentation in GitHub pages.
15+
16+
## [beta]
17+
18+
### 1.0.0-beta 2021-12-11
19+
- Fixed slow item search.
20+
- Updated plugin search result to include pagination [#51](https://github.com/stac-utils/qgis-stac-plugin/pull/51).
21+
- Support for search result filtering and sorting [#47](https://github.com/stac-utils/qgis-stac-plugin/pull/47).
22+
- Implemented search [#40](https://github.com/stac-utils/qgis-stac-plugin/pull/40).
23+
- Added default configured STAC API catalogs [#26](https://github.com/stac-utils/qgis-stac-plugin/pull/26).
24+
- Basic STAC API support [#17](https://github.com/stac-utils/qgis-stac-plugin/pull/17).

admin.py

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -384,53 +384,31 @@ def _get_metadata() -> typing.Dict:
384384
email = raw_author_list[-1].replace(">", "")
385385
metadata = conf["tool"]["qgis-plugin"]["metadata"].copy()
386386

387-
path = LOCAL_ROOT_DIR / "CHANGELOG.md"
388-
with path.open() as fh:
389-
changelog_file = fh.read()
390-
391387
metadata.update(
392388
{
393389
"author": author,
394390
"email": email,
395391
"description": poetry_conf["description"],
396392
"version": poetry_conf["version"],
397393
"tags": ", ".join(metadata.get("tags", [])),
398-
"changelog": _parse_changelog(
399-
changelog_file, poetry_conf["version"]
400-
),
394+
"changelog": _changelog(),
401395
}
402396
)
403397
return metadata
404398

405399

406-
def _parse_changelog(changelog: str, version: str) -> str:
407-
""" Parses the text changelog into a format that can be
408-
used inside the metadata.txt plugin file.
400+
def _changelog() -> str:
401+
""" Reads the changelog content from a config file.
409402
410-
:param changelog: Plugin changelog
411-
:type changelog: str
403+
:returns: Plugin changelog
404+
:type: str
405+
"""
406+
path = LOCAL_ROOT_DIR / "docs/plugin/changelog.txt"
412407

413-
:param version: Plugin version
414-
:type version: str
408+
with path.open() as fh:
409+
changelog_file = fh.read()
415410

416-
:return changelog: Formatted plugin changelog
417-
:type changelog: str
418-
"""
419-
usable_fragment = changelog.partition(
420-
f"[{version}]")[-1].partition("[draft]")[
421-
0
422-
]
423-
if usable_fragment != "":
424-
no_square_brackets = re.sub(
425-
r"(\[(\d+.\d+.\d+)\])",
426-
"\g<2>",
427-
usable_fragment)
428-
result = f"{version} {no_square_brackets}". \
429-
replace("# ", ""). \
430-
replace("#", "")
431-
else:
432-
result = ""
433-
return result
411+
return changelog_file
434412

435413

436414
def _add_to_zip(

docs/changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--8<--
2+
CHANGELOG.md
3+
--8<--

docs/plugin/changelog.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
Version 1.0.0-pre 2022-01-11
3+
- Changed loading and downloading assets workflow.
4+
- Implemented testing connection functionality.
5+
- Reworked filter and sort features on the search item results.
6+
- Fetch for STAC API conformance classes.
7+
- Added STAC API signing using SAS token.
8+
- Support for downloading assets and loading item footprints in QGIS.
9+
- Enabled adding STAC item assets as map layers in QGIS.
10+
- Added plugin documentation in GitHub pages.
11+
12+
Version 1.0.0-beta 2021-12-11
13+
- Fixed slow item search.
14+
- Updated plugin search result to include pagination.
15+
- Support for search result filtering and sorting.
16+
- Implemented search.
17+
- Added default configured STAC API catalogs.
18+
- Basic STAC API support.

mkdocs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ nav:
1313
- User Guide: "user-guide.md"
1414
- Development: "development.md"
1515
- About: "about.md"
16+
- Changelog: "changelog.md"
1617

1718
plugins:
1819
- search
1920
- git-revision-date-localized
2021

2122
markdown_extensions:
23+
- pymdownx.snippets:
24+
base_path: .
2225
- meta:
2326

2427
extra_css:

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ PyQt5 = "^5.15.6"
1919
flask = "^2.0.2"
2020

2121
[tool.qgis-plugin.metadata]
22-
name = "STAC APIs Browser "
22+
name = "STAC API Browser "
2323
qgisMinimumVersion = "3.0"
24+
qgisMaximumVersion = "3.99"
2425
icon = "icon.png"
2526
experimental = "True"
2627
deprecated = "False"
@@ -35,7 +36,7 @@ hasProcessingProvider = "no"
3536
about = """\
3637
Adds functionality to search, load and manage STAC APIs resources inside QGIS.
3738
"""
38-
# changelog: dynamically pulled from the README.md file
39+
# changelog: dynamically pulled from the docs/plugin/changelog.txt file
3940
# description: dynamically pulled from the tool.poetry.description section
4041
# version: dynamically pulled from the tool.poetry.version section
4142
# author: dynamically pulled from the tool.poetry.authors section

0 commit comments

Comments
 (0)