Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v2.5.2 #71

Merged
merged 5 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .build/mkdocs_markmap_build/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
import os
import sys
from pathlib import Path
from typing import Dict, List
from typing import List
from urllib3.poolmanager import PoolManager
from urllib3.response import HTTPResponse

from github import Github
from github.GitRelease import GitRelease
from github.Repository import Repository

from mkdocs_markmap.__meta__ import PACKAGE_NAME, PROJECT_NAME, PROJECT_VERSION, REPOSITORY_NAME
from mkdocs_markmap.__meta__ import PROJECT_NAME, PROJECT_VERSION, REPOSITORY_NAME


PROJECT_PATH: Path = Path(__file__).parent.parent.parent.absolute()
DIST_PATH: Path = PROJECT_PATH / 'dist'
CHANGELOG_PATH: Path = PROJECT_PATH / 'changelog'

GZ_WILDCARD: str = f'{PROJECT_NAME}-{{version}}*.gz'
WHL_WILDCARD: str = f'{PACKAGE_NAME}-{{version}}*.whl'
WHL_WILDCARD: str = f'{PROJECT_NAME}-{{version}}*.whl'


class GithubHandler(object):
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
name: Distribute
name: Ensure Integrity
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
4 changes: 4 additions & 0 deletions changelog/v2.5.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# v2.5.2

* Fix for DeprecationWarning due to use of `findChild` (#70)
* Fix for PEP 625 (#69)
5 changes: 2 additions & 3 deletions mkdocs_markmap/__meta__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PACKAGE_NAME: str = "mkdocs_markmap"
PROJECT_NAME: str = PACKAGE_NAME.replace("_", "-")
PROJECT_VERSION: str = "2.5.1"
PROJECT_NAME: str = "mkdocs_markmap"
PROJECT_VERSION: str = "2.5.2"

OWNER: str = "neatc0der"
ORGANISATION: str = "markmap"
Expand Down
2 changes: 1 addition & 1 deletion mkdocs_markmap/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def on_page_content(self, html: str, page: Page, **kwargs) -> str:
code: Tag
if markmap.name == "pre":
pre = markmap
code = markmap.findChild("code")
code = markmap.find("code")
else:
pre = markmap.parent
code = markmap
Expand Down
13 changes: 5 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
from mkdocs_markmap.__meta__ import OWNER, PROJECT_NAME, PROJECT_VERSION, REPOSITORY_URL


def readme() -> str:
"""print long description"""
with open('README.md') as f:
return f.read()


def get_requirements(filename: str, base_dir: str = 'requirements') -> List[str]:
"""Load list of dependencies."""
install_requires = []
with open(Path(base_dir) / filename) as fp:
with (Path(base_dir) / filename).open() as fp:
for line in fp:
stripped_line = line.partition('#')[0].strip()
if stripped_line:
Expand All @@ -27,7 +21,7 @@ def get_requirements(filename: str, base_dir: str = 'requirements') -> List[str]
name=PROJECT_NAME,
version=PROJECT_VERSION,
description='MkDocs plugin and extension to creates mindmaps from markdown using markmap',
long_description=readme(),
long_description=Path('README.md').read_text(),
long_description_content_type='text/markdown',
keywords='mkdocs python markdown markmap mindmap include',
url=REPOSITORY_URL,
Expand All @@ -46,6 +40,9 @@ def get_requirements(filename: str, base_dir: str = 'requirements') -> List[str]
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
],
packages=find_packages(exclude=['*.tests']),
package_dir={
Expand Down