kci-confluence-cli 0.4.0__tar.gz → 0.4.2__tar.gz

kci_confluence_cli-0.4.2/.devcontainer/.dockerignore

@@ -0,0 +1 @@
+/venv

kci_confluence_cli-0.4.2/.devcontainer/.extensions/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

kci_confluence_cli-0.4.2/.devcontainer/Dockerfile

@@ -0,0 +1,82 @@
+FROM ubuntu:22.04
+
+# Install prerequisites
+RUN set -x \
+    && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        gnupg2 \
+        software-properties-common \
+        language-pack-ja \
+        tzdata \
+        curl \
+        lsb-release \
+    && apt-get -y clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set locale & timezone
+RUN update-locale LANG=ja_JP.UTF-8 LANGUAGE=ja_JP:ja \
+    && ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime \
+    && echo "Asia/Tokyo" > /etc/timezone
+
+ENV LANG ja_JP.UTF-8
+ENV LC_ALL ja_JP.UTF-8
+ENV LC_CTYPE ja_JP.UTF-8
+
+
+RUN set -x \
+    && sed -i.bak -r 's!(deb|deb-src) \S+!\1 mirror://mirrors.ubuntu.com/mirrors.txt!' /etc/apt/sources.list
+
+# Install Ubuntu packages
+RUN set -x \
+    # Python3.12をインストールするために、deadsnakes PPAを追加
+    && add-apt-repository ppa:deadsnakes/ppa \
+    # Install packages
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        # python
+        python3.12-dev \
+        python3-pip \
+        # common tools
+        bash-completion \
+        build-essential \
+        git \
+        iputils-ping \
+        jq \
+        less \
+        net-tools \
+        openssh-client \
+        shellcheck \
+        sudo \
+        tar \
+        time \
+        unzip \
+        vim \
+        wget \
+        xz-utils \
+        zip \
+    && apt-get -y clean \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Python / pip
+RUN ln -s $(which python3.12) /usr/bin/python
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PIP_DEFAULT_TIMEOUT=100 \
+    PIP_NO_CACHE_DIR=on \
+    PIP_DISABLE_PIP_VERSION_CHECK=on
+
+# uv
+RUN set -x \
+    && python -m pip install -U \
+        pip \
+        setuptools \
+        requests \
+    && python -m pip install \
+        uv
+
+# Add user / Grant sudo privileges
+RUN useradd -m -s /bin/bash -u 5000 -U vscode \
+    && echo "vscode ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/ALL
+
+USER vscode

kci_confluence_cli-0.4.2/.devcontainer/devcontainer.json

@@ -0,0 +1,49 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"context": ".",
+		"args": {}
+	},
+	"containerUser": "vscode",
+	"remoteUser": "vscode",
+	"updateRemoteUserUID": true,
+	// マウント対象のディレクトリを事前に作成する
+	"initializeCommand": "mkdir -p ${localWorkspaceFolder}/.devcontainer/venv",
+	"mounts": [
+		// ホスト側のvenvとコンテナ側のvenvを分離する
+		"source=${localWorkspaceFolder}/.devcontainer/venv,target=${containerWorkspaceFolder}/.venv,type=bind"
+	],
+	"forwardPorts": [],
+	"runArgs": [
+		"--init",
+		"--net=host",
+		"--env=CONFLUENCE_USER_NAME",
+		"--env=CONFLUENCE_USER_PASSWORD",
+		"--env=CONFLUENCE_BASE_URL"
+	],
+	"containerEnv": {
+		"CONTAINER_WORKSPACE": "${containerWorkspaceFolder}",
+		"LOCAL_WORKSPACE": "${localWorkspaceFolder}"
+	},
+	"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces,type=bind,consistency=cached",
+	"workspaceFolder": "/workspaces",
+	"postStartCommand": "uv sync --all-groups",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"mosapride.zenkaku",
+				"ms-python.python",
+				"ms-python.vscode-pylance",
+				"charliermarsh.ruff",
+				"streetsidesoftware.code-spell-checker",
+				"bungcip.better-toml",
+				"njpwerner.autodocstring",
+				"mechatroner.rainbow-csv",
+				"lextudio.restructuredtext"
+			]
+		}
+	}
+}

kci_confluence_cli-0.4.2/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"

kci_confluence_cli-0.4.2/.github/workflows/lint-test.yml

@@ -0,0 +1,40 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.12', '3.13', '3.14']
+    
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          cache-dependency-glob: uv.lock
+      
+      - name: Install dependencies
+        env:
+          PIP_DEFAULT_TIMEOUT: 300
+        run: uv sync --all-groups
+      
+      - name: Run tests
+        run: make test
+      
+      - name: Run lint (Python 3.14 only)
+        if: matrix.python-version == '3.14'
+        run: make lint

kci_confluence_cli-0.4.2/.github/workflows/publish-to-pypi.yml

@@ -0,0 +1,24 @@
+name: Publish Python 🐍 distributions 📦 to PyPI
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to PyPI
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+    - name: Set up uv
+      uses: astral-sh/setup-uv@v6
+    - name: Publish
+      env:
+        UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      run: |
+        uv build
+        uv publish

kci_confluence_cli-0.4.2/.gitignore

@@ -0,0 +1,106 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+out/

kci_confluence_cli-0.4.2/.readthedocs.yaml

@@ -0,0 +1,15 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+sphinx:
+   configuration: docs/conf.py
+
+python:
+   install:
+   - requirements: docs/requirements.txt
+   - method: pip
+     path: .

kci_confluence_cli-0.4.2/.vscode/cspell.json

@@ -0,0 +1,36 @@
+{
+    "version": "0.2",
+    "ignorePaths": [
+        "**/.git/objects/**",
+        ".devcontainer/",
+        ".vscode/",
+        "LICENSE",
+        "tests/"
+    ],
+    "enabledLanguageIds": [
+        "python",
+        "reStructuredText"
+    ],
+    "words": [
+        "annofab",
+        "astimezone",
+        "astype",
+        "asyncio",
+        "backoff",
+        "dateutil",
+        "dtypes",
+        "getrgb",
+        "giveup",
+        "groupby",
+        "inplace",
+        "itertools",
+        "nargs",
+        "noqa",
+        "popen",
+        "pylint",
+        "pyquery",
+        "toolbelt",
+        "tzlocal",
+        "unsubscriptable"
+    ]
+}

kci_confluence_cli-0.4.2/.vscode/extension.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "ms-vscode-remote.remote-containers"
+    ],
+    "unwantedRecommendations": [
+    ]
+}

kci_confluence_cli-0.4.2/.vscode/settings.json

@@ -0,0 +1,27 @@
+{
+    "terminal.integrated.allowChords": false, // terminal上でEmacsキーバインドを使うための設定
+    "files.exclude": {
+        "**/.devcontainer/.extensions": true,
+        "**/__pycache__": true,
+        "**/.pytest_cache": true
+    },
+    "files.watcherExclude": {
+        "**/.devcontainer/.extensions": true,
+    },
+    "search.exclude": {
+        "**/.devcontainer/.extensions": true,
+    },
+    "files.autoSave": "afterDelay",
+    "files.autoSaveDelay": 1000,
+    "python.languageServer": "Pylance",
+    "python.autoComplete.extraPaths": [
+        ".venv/lib/python3.12/site-packages/"
+    ],
+    "python.analysis.extraPaths": [
+        ".venv/lib/python3.12/site-packages/"
+    ],
+    "python.analysis.completeFunctionParens": true,
+    "[python]": {
+    },
+    "python.testing.autoTestDiscoverOnSaveEnabled": false,
+}

kci_confluence_cli-0.4.2/Makefile

@@ -0,0 +1,26 @@
+ifndef SOURCE_FILES
+	export SOURCE_FILES:=confluence
+endif
+ifndef TEST_FILES
+	export TEST_FILES:=tests
+endif
+
+.PHONY: format lint test docs publish
+
+format:
+	uv run ruff format ${SOURCE_FILES}  ${TEST_FILES}
+	uv run ruff check ${SOURCE_FILES} ${TEST_FILES} --fix-only --exit-zero
+
+
+
+lint:
+	uv run ruff check ${SOURCE_FILES} ${TEST_FILES}
+	uv run mypy ${SOURCE_FILES}
+
+test:
+	# 並列実行してレポートも出力する
+	uv run pytest -n auto  --cov=kci --cov-report=html tests
+
+docs:
+	cd docs && uv run make html
+

{kci_confluence_cli-0.4.0 → kci_confluence_cli-0.4.2}/PKG-INFO

@@ -1,42 +1,39 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.5
 Name: kci-confluence-cli
-Version: 0.4.0
-Summary: 来栖川電算が利用しているConfluence v6.15.7を操作するためのCLIです。
-Home-page: https://github.com/kurusugawa-computer/confluence-cli
-License: MIT
+Version: 0.4.2
+Summary: Confluence v6.15.7を操作するためのCLIです。
+Project-URL: Repository, https://github.com/kurusugawa-computer/confluence-cli
 Author: Kurusugawa Computer Inc.
-Requires-Python: >=3.9,<4.0
+License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
+Requires-Python: >=3.12
 Requires-Dist: backoff
-Requires-Dist: more_itertools
-Requires-Dist: pyquery (>=2,<3)
+Requires-Dist: lxml
+Requires-Dist: more-itertools
+Requires-Dist: pyquery>=2
 Requires-Dist: pyyaml
 Requires-Dist: requests
-Requires-Dist: requests-toolbelt (>=1,<2)
-Project-URL: Repository, https://github.com/kurusugawa-computer/confluence-cli
+Requires-Dist: requests-toolbelt>=1
 Description-Content-Type: text/markdown
 
 # confluence-cli
-来栖川電算が利用しているConfluence v6.15.7を操作するためのCLIです。
+Confluence v6.15.7を操作するためのCLIです。
 
 
-[![Build Status](https://app.travis-ci.com/kurusugawa-computer/confluence-cli.svg?branch=main)](https://app.travis-ci.com/kurusugawa-computer/confluence-cli)
+[![Test](https://github.com/kurusugawa-computer/confluence-cli/actions/workflows/lint-test.yml/badge.svg)](https://github.com/kurusugawa-computer/confluence-cli/actions/workflows/lint-test.yml)
 [![PyPI version](https://badge.fury.io/py/kci-confluence-cli.svg)](https://badge.fury.io/py/kci-confluence-cli)
 [![Python Versions](https://img.shields.io/pypi/pyversions/kci-confluence-cli.svg)](https://pypi.org/project/kci-confluence-cli/)
 [![Documentation Status](https://readthedocs.org/projects/confluence-cli/badge/?version=latest)](https://confluence-cli.readthedocs.io/ja/latest/?badge=latest)
 
 # Requirements
-Python 3.9+
+Python 3.12+
 
 # Install
 
@@ -44,6 +41,13 @@ Python 3.9+
 $ pip install kci-confluence-cli
 ```
 
+`uv` を使用している場合は、インストールせずに実行することもできます。
+
+```bash
+$ uvx --from kci-confluence-cli confluence page get_body --page_id 123456
+```
+
+
 # Quick Start
 
 環境変数で認証情報を設定:
@@ -57,7 +61,7 @@ export CONFLUENCE_BASE_URL="https://your-domain.com/confluence"
 ページ本文を取得:
 
 ```bash
-$ confluence page get_body --page_id 12345
+$ confluence page get_body --page_id 123456
 ```
 
 # Documentation
@@ -67,5 +71,3 @@ $ confluence page get_body --page_id 12345
 - [Getting Started](https://confluence-cli.readthedocs.io/ja/latest/user_guide/getting_started.html) - インストール方法と基本的な使い方
 - [User Guide](https://confluence-cli.readthedocs.io/ja/latest/user_guide/index.html) - チュートリアルと実践的な使い方
 - [Command Reference](https://confluence-cli.readthedocs.io/ja/latest/command_reference/index.html) - 全コマンドのリファレンス
-
-

{kci_confluence_cli-0.4.0 → kci_confluence_cli-0.4.2}/README.md

@@ -1,14 +1,14 @@
 # confluence-cli
-来栖川電算が利用しているConfluence v6.15.7を操作するためのCLIです。
+Confluence v6.15.7を操作するためのCLIです。
 
 
-[![Build Status](https://app.travis-ci.com/kurusugawa-computer/confluence-cli.svg?branch=main)](https://app.travis-ci.com/kurusugawa-computer/confluence-cli)
+[![Test](https://github.com/kurusugawa-computer/confluence-cli/actions/workflows/lint-test.yml/badge.svg)](https://github.com/kurusugawa-computer/confluence-cli/actions/workflows/lint-test.yml)
 [![PyPI version](https://badge.fury.io/py/kci-confluence-cli.svg)](https://badge.fury.io/py/kci-confluence-cli)
 [![Python Versions](https://img.shields.io/pypi/pyversions/kci-confluence-cli.svg)](https://pypi.org/project/kci-confluence-cli/)
 [![Documentation Status](https://readthedocs.org/projects/confluence-cli/badge/?version=latest)](https://confluence-cli.readthedocs.io/ja/latest/?badge=latest)
 
 # Requirements
-Python 3.9+
+Python 3.12+
 
 # Install
 
@@ -16,6 +16,13 @@ Python 3.9+
 $ pip install kci-confluence-cli
 ```
 
+`uv` を使用している場合は、インストールせずに実行することもできます。
+
+```bash
+$ uvx --from kci-confluence-cli confluence page get_body --page_id 123456
+```
+
+
 # Quick Start
 
 環境変数で認証情報を設定:
@@ -29,7 +36,7 @@ export CONFLUENCE_BASE_URL="https://your-domain.com/confluence"
 ページ本文を取得:
 
 ```bash
-$ confluence page get_body --page_id 12345
+$ confluence page get_body --page_id 123456
 ```
 
 # Documentation
@@ -39,4 +46,3 @@ $ confluence page get_body --page_id 12345
 - [Getting Started](https://confluence-cli.readthedocs.io/ja/latest/user_guide/getting_started.html) - インストール方法と基本的な使い方
 - [User Guide](https://confluence-cli.readthedocs.io/ja/latest/user_guide/index.html) - チュートリアルと実践的な使い方
 - [Command Reference](https://confluence-cli.readthedocs.io/ja/latest/command_reference/index.html) - 全コマンドのリファレンス
-

{kci_confluence_cli-0.4.0 → kci_confluence_cli-0.4.2}/confluence/__main__.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import argparse
 import logging
 from collections.abc import Sequence
-from typing import Optional
 
 import confluence
 import confluence.attachment.subcommand
@@ -30,7 +29,7 @@ def create_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main(arguments: Optional[Sequence[str]] = None):  # noqa: ANN201
+def main(arguments: Sequence[str] | None = None):  # noqa: ANN201
     parser = create_parser()
     if arguments is None:
         args = parser.parse_args()

kci_confluence_cli-0.4.2/confluence/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.0.0"  # `uv-dynamic-versioning`を使ってGitHubのバージョンタグを取得している。変更不要

{kci_confluence_cli-0.4.0 → kci_confluence_cli-0.4.2}/confluence/attachment/create_attachment.py

@@ -5,7 +5,7 @@ import logging
 from pathlib import Path
 from typing import Any
 
-import confluence
+from confluence.common import cli
 from confluence.common.api import Api
 from confluence.common.cli import create_api_instance
 
@@ -27,9 +27,9 @@ def create_attachments_from_file_list(
 
         try:
             api.create_attachment(content_id, file, query_params=query_params, mime_type=mime_type)
-            logger.debug(f"{index+1}件目: '{file}'をアップロードしました。")
+            logger.debug(f"{index + 1}件目: '{file}'をアップロードしました。")
             if (index + 1) % 10 == 0:
-                logger.info(f"{index+1}件目のファイルのアップロードが完了しました。")
+                logger.info(f"{index + 1}件目のファイルのアップロードが完了しました。")
 
         except Exception:
             logger.warning(f"'{file}'のアップロードに失敗しました。", exc_info=True)
@@ -62,9 +62,9 @@ def create_attachments_from_directory(
     for index, file in enumerate(files):
         try:
             api.create_attachment(content_id, file, query_params=query_params, mime_type=mime_type)
-            logger.debug(f"{index+1}件目: '{file}'をアップロードしました。")
+            logger.debug(f"{index + 1}件目: '{file}'をアップロードしました。")
             if (index + 1) % 10 == 0:
-                logger.info(f"{index+1}件目のファイルのアップロードが完了しました。")
+                logger.info(f"{index + 1}件目のファイルのアップロードが完了しました。")
 
         except Exception:
             logger.warning(f"'{file}'のアップロードに失敗しました。", exc_info=True)
@@ -107,7 +107,7 @@ def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse
     subcommand_name = "create"
     subcommand_help = "添付ファイルを作成します。"
 
-    parser = confluence.common.cli.add_parser(subparsers, subcommand_name, subcommand_help)
+    parser = cli.add_parser(subparsers, subcommand_name, subcommand_help)
 
     add_arguments_to_parser(parser)
     return parser

{kci_confluence_cli-0.4.0 → kci_confluence_cli-0.4.2}/confluence/attachment/delete_attachment.py

@@ -4,7 +4,7 @@ import argparse
 import logging
 from typing import Any
 
-import confluence
+from confluence.common import cli
 from confluence.common.api import Api
 from confluence.common.cli import create_api_instance, prompt_yesnoall
 
@@ -54,15 +54,15 @@ def main(args: argparse.Namespace) -> None:
 
                 yes, all_yes = prompt_yesnoall(confirm_message)
             if yes or all_yes:
-                logger.debug(f"{index+1}件目: id='{attachment_id}', title='{attachment_title}'をゴミ箱に移動します。 ")
+                logger.debug(f"{index + 1}件目: id='{attachment_id}', title='{attachment_title}'をゴミ箱に移動します。 ")
                 api.delete_content(attachment_id, query_params={"status": "current"})
                 if is_purged:
-                    logger.debug(f"{index+1}件目: id='{attachment_id}', title='{attachment_title}'をゴミ箱から完全に削除します。 ")
+                    logger.debug(f"{index + 1}件目: id='{attachment_id}', title='{attachment_title}'をゴミ箱から完全に削除します。 ")
                     api.delete_content(attachment_id, query_params={"status": "trashed"})
                 success_count += 1
 
         except Exception:
-            logger.warning(f"{index+1}件目: id='{attachment_id}', title='{attachment_title}'の削除に失敗しました。", exc_info=True)
+            logger.warning(f"{index + 1}件目: id='{attachment_id}', title='{attachment_title}'の削除に失敗しました。", exc_info=True)
             continue
 
     logger.info(f"{success_count}/{len(results)} 件の添付ファイルを削除しました。")
@@ -81,7 +81,7 @@ def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse
     subcommand_name = "delete"
     subcommand_help = "添付ファイルを削除します。"
 
-    parser = confluence.common.cli.add_parser(subparsers, subcommand_name, subcommand_help)
+    parser = cli.add_parser(subparsers, subcommand_name, subcommand_help)
 
     add_arguments_to_parser(parser)
     return parser