annofabcli 1.100.0__tar.gz → 1.100.4__tar.gz

annofabcli-1.100.4/.devcontainer/.extensions/.gitignore

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

annofabcli-1.100.4/.devcontainer/Dockerfile

@@ -0,0 +1,77 @@
+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 http://jp.archive.ubuntu.com/ubuntu/!' /etc/apt/sources.list
+
+# Install Ubuntu packages
+RUN set -x \
+    # Install packages
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        # common tools
+        bash-completion \
+        build-essential \
+        git \
+        iputils-ping \
+        jq \
+        less \
+        net-tools \
+        openssh-client \
+        sudo \
+        tar \
+        time \
+        unzip \
+        vim \
+        wget \
+        xz-utils \
+        zip \
+    && apt-get -y clean \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Add user / Grant sudo privileges
+ARG USERNAME=vscode
+RUN useradd -m -s /bin/bash -u 5000 -U ${USERNAME} \
+&& echo "${USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/ALL
+
+USER ${USERNAME}
+
+ARG UV_VERSION=0.6.14
+RUN set -x \
+    && curl -LsSf https://astral.sh/uv/${UV_VERSION}/install.sh | sh \
+    && echo 'eval "$(uv generate-shell-completion bash)"' >> /home/${USERNAME}/.bashrc \
+    && echo 'eval "$(uvx --generate-shell-completion bash)"' >> /home/${USERNAME}/.bashrc
+
+ENV PATH=/home/${USERNAME}/.local/bin/:${PATH} \
+    UV_NO_CACHE=1 \
+    UV_LINK_MODE=copy
+    
+# install python
+ARG PYTHON_VERSION=3.12.10
+RUN uv python install ${PYTHON_VERSION} --default --preview
+    
+    
+

annofabcli-1.100.4/.devcontainer/devcontainer.json

@@ -0,0 +1,48 @@
+// 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を分類して、ホスト側でuvコマンドを利用できるようにする
+		"source=${localWorkspaceFolder}/.devcontainer/venv,target=${containerWorkspaceFolder}/.venv,type=bind"
+	],
+	"forwardPorts": [],
+	"runArgs": [
+		"--init",
+		"--net=host",
+		"--env=ANNOFAB_USER_ID",
+		"--env=ANNOFAB_PASSWORD"
+	],
+	"containerEnv": {
+		"CONTAINER_WORKSPACE": "${containerWorkspaceFolder}",
+		"LOCAL_WORKSPACE": "${localWorkspaceFolder}"
+	},
+	"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/annofab-cli,type=bind,consistency=cached",
+	"workspaceFolder": "/workspaces/annofab-cli",
+	"postStartCommand": "uv sync",
+	"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"
+			]
+		}
+	}
+}

annofabcli-1.100.4/.github/dependabot.yml

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

annofabcli-1.100.4/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '20 0 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

annofabcli-1.100.4/.github/workflows/lint-test.yml

@@ -0,0 +1,55 @@
+name: Python tests and lint
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+env:
+  # 認証情報を確認するテストを動作させるために、適当な値を認証情報として設定する
+  ANNOFAB_USER_ID: foo
+  ANNOFAB_PASSWORD: bar
+
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: ${{ matrix.python-version }}        
+          # Install a specific version of uv.
+          version: "0.6.14"
+      - name: Install the project
+        run: uv sync
+      - name: Test
+        run: |
+            uv run pytest -n auto -m "not access_webapi"
+          
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: ${{ matrix.python-version }}        
+          # Install a specific version of uv.
+          version: "0.6.14"
+      - name: Install the project
+        run: uv sync
+      - name: Lint
+        run: |
+            make lint
+      

annofabcli-1.100.4/.github/workflows/publish-to-pypi.yml

@@ -0,0 +1,27 @@
+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@v3
+    - name: Install uv and set the python version
+      uses: astral-sh/setup-uv@v5
+      with:
+        python-version: "3.12"
+        # Install a specific version of uv.
+        version: "0.6.14"
+    - name: Install the project
+      run: uv sync
+
+    - name: Publish
+      env:
+        PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+      run: |
+        uv build
+        uv publish --token $PYPI_TOKEN

annofabcli-1.100.4/.github/workflows/release.yml

@@ -0,0 +1,39 @@
+name: publish executable file to release page
+# releaseページにWindows用の実行ファイルをアップロードする。windowsはpython環境の構築に少し手間がかかるので、実行可能ファイルを用意する。
+
+on:
+  release:
+    types:
+    - published
+
+permissions:
+  contents: write
+  
+  
+jobs:
+  build-and-release: 
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: "3.12"
+          # Install a specific version of uv.
+          version: "0.6.14"
+      - name: Install the project
+        run: uv sync --extra publish
+      - name: Create executable file with pyinstaller and zip
+        run: |
+          uv run pyinstaller annofabcli/__main__.py  --name annofabcli --add-data "annofabcli/data:annofabcli/data"          
+          pushd dist
+          Compress-Archive -Path annofabcli  -DestinationPath annofabcli-windows.zip
+          popd
+          
+      - name: Upload a executable file to GitHub Releases
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            dist/annofabcli-windows.zip
+            
+            

annofabcli-1.100.4/.gitignore

@@ -0,0 +1,115 @@
+# 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/
+
+# IntelliJ IDEA
+.idea/
+
+# output directory of tests
+tests/out/
+/out/
+
+.annofab-cli/
+
+pip-wheel-metadata/

annofabcli-1.100.4/.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: .

annofabcli-1.100.4/.vscode/cspell.json

@@ -0,0 +1,86 @@
+{
+    "version": "0.2",
+    "ignorePaths": [
+        "**/.git/objects/**",
+        ".devcontainer/",
+        ".vscode/",
+        "LICENSE",
+        "tests/",
+        "docs/conf.py",
+        ".venv/"
+    ],
+    "enabledLanguageIds": [
+        "python",
+        "reStructuredText"
+    ],
+    "words": [
+        "__lastweek",
+        "additionals",
+        "aggfunc",
+        "Annofab",
+        "annofabapi",
+        "annofabcli",
+        "Annowork",
+        "arange",
+        "asdict",
+        "astimezone",
+        "astype",
+        "asyncio",
+        "bokeh",
+        "cumsum",
+        "dataclass",
+        "Dataframe",
+        "dateutil",
+        "ddof",
+        "Downcasting",
+        "dropna",
+        "dryrun",
+        "dtype",
+        "dtypes",
+        "errstate",
+        "fillna",
+        "getrgb",
+        "gridplot",
+        "groupby",
+        "holoviews",
+        "iloc",
+        "inplace",
+        "isin",
+        "isna",
+        "isnan",
+        "isodate",
+        "isoduration_to_hour",
+        "iterrows",
+        "itertools",
+        "itertuples",
+        "jmespath",
+        "keybind",
+        "lenna",
+        "linegraph",
+        "multiheader",
+        "multiindex",
+        "mypy",
+        "nargs",
+        "ncols",
+        "ndarray",
+        "netrc",
+        "noqa",
+        "notequals",
+        "notna",
+        "numpy",
+        "ONHOLD",
+        "pformat",
+        "pickel",
+        "pylint",
+        "pyquery",
+        "pytest",
+        "pytz",
+        "quantile",
+        "strtobool",
+        "tolist",
+        "tzlocal",
+        "webapi",
+        "worktime",
+        "yesnoall"
+    ]
+}

annofabcli-1.100.4/.vscode/settings.json

@@ -0,0 +1,28 @@
+{
+    "terminal.integrated.allowChords": false, // terminal上でEmacsキーバインドを使うための設定
+    "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,
+    "files.exclude": {
+        ".coverage*": true,
+        "**/__pycache__": true,
+        "**/.pytest_cache": true,
+        "build/": true,
+        "dist/": true,
+        "docs/_build/": true,
+        "htmlcov/": true,
+        "out/": true,
+        "*.egg-info/": true,
+        ".devcontainer/.extensions/": true,
+        ".devcontainer/venv/": true
+    },
+    "editor.minimap.enabled": false,
+
+}

annofabcli-1.100.4/Makefile

@@ -0,0 +1,26 @@
+ifndef SOURCE_FILES
+	export SOURCE_FILES:=annofabcli scripts
+endif
+ifndef TEST_FILES
+	export TEST_FILES:=tests
+endif
+.PHONY: docs lint test format publish_test 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 format ${SOURCE_FILES} ${TEST_FILES} --check
+	uv run ruff check ${SOURCE_FILES} ${TEST_FILES}
+	uv run mypy ${SOURCE_FILES} ${TEST_FILES}
+	# テストコードはチェックを緩和するためpylintは実行しない
+	uv run pylint --jobs=0 ${SOURCE_FILES}
+
+test:
+    # 更新の競合が発生する可能性があるので、並列実行しない
+	# skip対象のmakersを実行しないように"-m"で指定する
+	uv run pytest --cov=${SOURCE_FILES} --cov-report=html ${TEST_FILES} -m "not submitting_job and not depending_on_annotation_specs"
+
+docs:
+	cd docs && uv run make html

{annofabcli-1.100.0 → annofabcli-1.100.4}/PKG-INFO

@@ -1,38 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.100.0
+Version: 1.100.4
 Summary: Utility Command Line Interface for AnnoFab
-Home-page: https://github.com/kurusugawa-computer/annofab-cli
+Author: Kurusugawa Computer Inc.
 License: MIT
+License-File: LICENSE
 Keywords: annofab,cli
-Author: yuji38kwmt
-Requires-Python: >=3.9,<4.0
 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: Topic :: Utilities
-Requires-Dist: Pillow
-Requires-Dist: annofabapi (>=1.4.1,<2.0.0)
-Requires-Dist: bokeh (>=3.3,<3.7)
+Requires-Python: >=3.9
+Requires-Dist: annofabapi>=1.4.1
+Requires-Dist: bokeh<3.7,>=3.3
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
-Requires-Dist: jmespath
 Requires-Dist: more-itertools
 Requires-Dist: numpy
-Requires-Dist: pandas (>=2,<3)
+Requires-Dist: pandas<3,>=2
+Requires-Dist: pillow
 Requires-Dist: pyquery
 Requires-Dist: python-datauri
 Requires-Dist: pyyaml
 Requires-Dist: requests
-Requires-Dist: typing-extensions (>=4.5,<5.0)
-Project-URL: Repository, https://github.com/kurusugawa-computer/annofab-cli
+Requires-Dist: typing-extensions>=4.5
 Description-Content-Type: text/markdown
 
 # annofab-cli
@@ -58,14 +50,10 @@ Description-Content-Type: text/markdown
 
 
 ## 廃止予定
-
-
-### 2022-11-01 以降
-* JMESPathを指定できる `--query`を削除します。使いどころがあまりないのと、`jq`コマンドでも対応できるためです。
-
+* TODO
 
 # Requirements
-* Python 3.9
+* Python 3.9+
 
 # Install
 
@@ -127,4 +115,3 @@ WindowsのコマンドプロンプトやPowerShellでannofabcliを使う場合
 ```
 > annofabcli task list --project_id prj1  --task_query '{"\status\": \"complete\"}'
 ```
-

{annofabcli-1.100.0 → annofabcli-1.100.4}/README.md

@@ -21,14 +21,10 @@
 
 
 ## 廃止予定
-
-
-### 2022-11-01 以降
-* JMESPathを指定できる `--query`を削除します。使いどころがあまりないのと、`jq`コマンドでも対応できるためです。
-
+* TODO
 
 # Requirements
-* Python 3.9
+* Python 3.9+
 
 # Install