From d401c6454097f58e1b89475c513b94b5572e2f46 Mon Sep 17 00:00:00 2001 From: Donald Mellenbruch Date: Thu, 22 Jun 2023 00:00:00 -0500 Subject: [PATCH 1/2] build: apply project template --- .copier-answers.yml | 15 +++++++------ .dockerignore | 9 +++++--- .drone.yml | 18 ++++++++------- .github/FUNDING.yml | 1 + .gitignore | 4 +++- Dockerfile | 2 +- Dockerfile-docs | 2 +- README.md | 45 ++++++++++++++++++++------------------ config/mkdocs.yml | 6 ++++- config/overrides/main.html | 15 +++++++++++++ pyproject.toml | 10 ++++----- requirements.txt | 3 --- 12 files changed, 79 insertions(+), 51 deletions(-) create mode 100644 .github/FUNDING.yml delete mode 100644 requirements.txt diff --git a/.copier-answers.yml b/.copier-answers.yml index a17a8aa..227551e 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,20 +1,21 @@ # Changes here will be overwritten by Copier -_commit: 8d1a17d +_commit: a01a11e _src_path: https://codeberg.org/Fresh2dev/copier-f2dv-project.git -author_email: hello@Fresh2.dev +author_email: hello@f2dv.com author_name: Donald Mellenbruch ci_domain_name: lokalhost.net -docs_url: https://www.Fresh2.dev/code/r/ppqueue/i -funding_url: https://www.Fresh2.dev/funding -home_page: https://www.Fresh2.dev +docs_url: https://www.f2dv.com/r/ppqueue +funding_url: https://www.f2dv.com/fund +home_domain: f2dv.com +home_page: https://www.f2dv.com is_minimal: false is_python: true license_type: MIT package_name: ppqueue -project_description: Parallel Process Queue (ppqueue) for Python +project_description: A Parallel Process Queue for Python. project_name: ppqueue python_version: '3.8' -repo_mirror: https://www.Fresh2.dev/code/r/ppqueue +repo_mirror: https://www.f2dv.com/r/ppqueue repo_name: fresh2dev/ppqueue repo_owner: fresh2dev repo_url: https://www.github.com/fresh2dev/ppqueue diff --git a/.dockerignore b/.dockerignore index 54a8b54..6277b66 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,13 +2,16 @@ **/secrets !**/*.keep -**/*.tmp/build +**/*.tmp +**/.vscode +**/.DS_store +/build +**/.ipynb_checkpoints **/.coverage **/.hypothesis **/.tox **/.idea -**/.vscode **/*.egg-info **/.mypy_cache **/__pycache__ -**/.pytest_cache \ No newline at end of file +**/.pytest_cache diff --git a/.drone.yml b/.drone.yml index 83e15d8..2622e63 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,9 +5,11 @@ data: ["lokalhost.net", "fresh2.dev"] domainTriggers: >- { - "lokalhost.net": {}, + "lokalhost.net": { + "event": {"exclude": ["promote"]} + }, "fresh2.dev": { - "ref": ["refs/heads/main", "refs/tags/*"] + "event": ["promote", "tag"] } } domainClusterMap: >- @@ -26,7 +28,7 @@ data: [ { "name": "py-test", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PIP_CONF": {"from_secret": "PIP_CONF"}, "MYKE_MODULE": "mykefiles.python" @@ -46,7 +48,7 @@ data: [ { "name": "py-build-package", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PYPI_CREDS": {"from_secret": "PYPI_CREDS"}, "PIP_CONF": {"from_secret": "PIP_CONF"}, @@ -62,7 +64,7 @@ data: }, { "name": "py-publish-sandbox", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PYPI_CREDS": {"from_secret": "PYPI_CREDS"}, "PIP_CONF": {"from_secret": "PIP_CONF"}, @@ -78,7 +80,7 @@ data: }, { "name": "py-publish-dev", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PYPI_CREDS": {"from_secret": "PYPI_CREDS"}, "PIP_CONF": {"from_secret": "PIP_CONF"}, @@ -96,7 +98,7 @@ data: }, { "name": "py-publish-test", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PYPI_CREDS": {"from_secret": "PYPI_CREDS"}, "PIP_CONF": {"from_secret": "PIP_CONF"}, @@ -114,7 +116,7 @@ data: }, { "name": "py-publish-prod", - "image": "registry.lokalhost.net/fresh2dev/mykefiles:5de40c3", + "image": "registry.lokalhost.net/fresh2dev/mykefiles:a43f1d5", "environment": { "PYPI_CREDS": {"from_secret": "PYPI_CREDS"}, "PIP_CONF": {"from_secret": "PIP_CONF"}, diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..d96b81a --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +custom: ["https://www.f2dv.com/fund", "https://www.f2dv.com/paypal"] diff --git a/.gitignore b/.gitignore index b8092cc..551579c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ **/secrets !**/*.keep **/*.tmp +**/.vscode +**/.DS_store .python-version /public @@ -9,12 +11,12 @@ /dist /build +*.pyc **/.ipynb_checkpoints **/.coverage **/.hypothesis **/.tox **/.idea -**/.vscode **/*.egg-info **/.mypy_cache **/__pycache__ diff --git a/Dockerfile b/Dockerfile index 690b578..3cad0db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG HB_IMAGE_REGISTRY=docker.io FROM ${HB_IMAGE_REGISTRY}/python:3.10.10-slim-bullseye as build LABEL org.opencontainers.image.source=https://www.github.com/fresh2dev/ppqueue -LABEL org.opencontainers.image.description="Parallel Process Queue (ppqueue) for Python" +LABEL org.opencontainers.image.description="A Parallel Process Queue for Python." LABEL org.opencontainers.image.licenses=MIT RUN apt-get update && apt-get install --upgrade -y build-essential git WORKDIR /app diff --git a/Dockerfile-docs b/Dockerfile-docs index 4f22f85..472ba04 100644 --- a/Dockerfile-docs +++ b/Dockerfile-docs @@ -1,7 +1,7 @@ ARG HB_IMAGE_REGISTRY=docker.io FROM ${HB_IMAGE_REGISTRY}/nginx:1 LABEL org.opencontainers.image.source=https://www.github.com/fresh2dev/ppqueue -LABEL org.opencontainers.image.description="Parallel Process Queue (ppqueue) for Python" +LABEL org.opencontainers.image.description="A Parallel Process Queue for Python." LABEL org.opencontainers.image.licenses=MIT ARG CONTENT_PATH=public COPY $CONTENT_PATH /usr/share/nginx/html diff --git a/README.md b/README.md index c7c470c..180fe7a 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,28 @@ # ppqueue -> Parallel Process Queue (ppqueue) for Python - -> Formerly known as `ezpq` - -| Links | | -|---------------|------------------------| -| Code Repo | https://www.github.com/fresh2dev/ppqueue | -| Mirror Repo | https://www.Fresh2.dev/code/r/ppqueue | -| Documentation | https://www.Fresh2.dev/code/r/ppqueue/i | -| Changelog | https://www.Fresh2.dev/code/r/ppqueue/i/changelog | -| License | https://www.Fresh2.dev/code/r/ppqueue/i/license | -| Funding | https://www.Fresh2.dev/funding | - -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.github.com/fresh2dev/ppqueue/releases) -[![GitHub Release Date](https://img.shields.io/github/release-date/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.github.com/fresh2dev/ppqueue/releases) -[![License](https://img.shields.io/github/license/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.Fresh2.dev/code/r/ppqueue/i/license) +> A Parallel Process Queue for Python. + +| Links | | +|---------------|------------------------------------------| +| Code Repo | https://www.github.com/fresh2dev/ppqueue | +| Mirror Repo | https://www.f2dv.com/r/ppqueue | +| Documentation | https://www.f2dv.com/r/ppqueue | +| Changelog | https://www.f2dv.com/r/ppqueue/changelog | +| License | https://www.f2dv.com/r/ppqueue/license | +| Funding | https://www.f2dv.com/fund | + +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.f2dv.com/r/ppqueue/changelog) +[![GitHub Release Date](https://img.shields.io/github/release-date/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.f2dv.com/r/ppqueue/changelog) +[![License](https://img.shields.io/github/license/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.f2dv.com/r/ppqueue/license) +[![GitHub Repo stars](https://img.shields.io/github/stars/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://star-history.com/#fresh2dev/ppqueue&Date) [![GitHub issues](https://img.shields.io/github/issues-raw/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.github.com/fresh2dev/ppqueue/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://www.github.com/fresh2dev/ppqueue/pulls) -[![GitHub Repo stars](https://img.shields.io/github/stars/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://star-history.com/#fresh2dev/ppqueue&Date) [![PyPI - Downloads](https://img.shields.io/pypi/dm/ppqueue?color=blue&style=for-the-badge)](https://pypi.org/project/ppqueue) -[![Docs Website](https://img.shields.io/website?down_message=unavailable&label=docs&style=for-the-badge&up_color=blue&up_message=available&url=https://www.Fresh2.dev/code/r/ppqueue/i)](https://www.Fresh2.dev/code/r/ppqueue/i) -[![Coverage Website](https://img.shields.io/website?down_message=unavailable&label=coverage&style=for-the-badge&up_color=blue&up_message=available&url=https://www.Fresh2.dev/code/r/ppqueue/i/tests/coverage)](https://www.Fresh2.dev/code/r/ppqueue/i/tests/coverage) -[![Funding](https://img.shields.io/badge/funding-%24%24%24-blue?style=for-the-badge)](https://www.Fresh2.dev/funding) +[![Docker Pulls](https://img.shields.io/docker/pulls/fresh2dev/ppqueue?color=blue&style=for-the-badge)](https://hub.docker.com/r/fresh2dev/ppqueue) +[![Changelog](https://img.shields.io/website?down_message=unavailable&label=docs&style=for-the-badge&up_color=blue&up_message=available&url=https://www.f2dv.com/r/ppqueue/changelog)](https://www.f2dv.com/r/ppqueue/changelog) +[![Funding](https://img.shields.io/badge/funding-%24%24%24-blue?style=for-the-badge)](https://www.f2dv.com/fund) +--- ## Overview @@ -54,8 +53,12 @@ And more examples are provided in the reference docs: https://www.f2dv.com/code/r/ppqueue/i/reference/ +## Support + +If this project delivers value to you, please [provide feedback](https://www.github.com/fresh2dev/ppqueue/issues), code contributions, and/or [funding](https://www.f2dv.com/fund). + --- *Brought to you by...* - \ No newline at end of file + diff --git a/config/mkdocs.yml b/config/mkdocs.yml index 103160f..9e20cec 100644 --- a/config/mkdocs.yml +++ b/config/mkdocs.yml @@ -1,6 +1,6 @@ site_name: "ppqueue" site_description: "ppqueue Docs" -site_url: !ENV [MKDOCS_SITE_URL, "https://www.Fresh2.dev/code/r/ppqueue/i"] +site_url: !ENV [MKDOCS_SITE_URL, "https://www.f2dv.com/r/ppqueue"] repo_url: "https://www.github.com/fresh2dev/ppqueue" repo_name: "fresh2dev/ppqueue" edit_uri: "edit/main/docs" @@ -26,6 +26,10 @@ nav: - Changelog: changelog.md - License: license.md - Discussion: comments.md + - '<- f2dv.com': + - '/home': 'https://www.f2dv.com' + - '/code': 'https://www.f2dv.com/projects' + - '/fund': 'https://www.f2dv.com/fund' watch: - ../src diff --git a/config/overrides/main.html b/config/overrides/main.html index 08df8bc..a931321 100644 --- a/config/overrides/main.html +++ b/config/overrides/main.html @@ -14,6 +14,21 @@ --md-text-font: iAWriterQuattroS, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif; --md-code-font: iAWriterMonoS, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace; } + +/* hide jupyter notebooks input/output numbers */ +.jp-InputPrompt { + display: none !important; +} + +.jp-OutputPrompt { + display: none !important; +} + +/* hide jupyter notebooks tags */ +.jupyter-wrapper .celltoolbar { + display: none !important; +} + {% endblock %} diff --git a/pyproject.toml b/pyproject.toml index 74c849f..e3ef82c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,9 +5,9 @@ build-backend = "setuptools.build_meta" [project] name = "ppqueue" authors = [ - {name = "Donald Mellenbruch", email = "hello@Fresh2.dev"}, + {name = "Donald Mellenbruch", email = "hello@f2dv.com"}, ] -description = "Parallel Process Queue (ppqueue) for Python" +description = "A Parallel Process Queue for Python." readme = "README.md" license = {file = "LICENSE"} requires-python = ">=3.8" @@ -25,7 +25,7 @@ dev = [ "python-lsp-server[rope]==1.*", "pylint==2.*", "pylint-pytest==1.*", - "mypy[reports]==0.*", + "mypy[reports]==1.*", "ruff==0.*", "black[jupyter]==23.*", "isort==5.*", @@ -69,9 +69,9 @@ extras = [ ] [project.urls] -Homepage = "https://www.Fresh2.dev/code/r/ppqueue/i" +Homepage = "https://www.f2dv.com/r/ppqueue" Repository = "https://www.github.com/fresh2dev/ppqueue" -Funding = "https://www.Fresh2.dev/funding" +Funding = "https://www.f2dv.com/fund" [project.scripts] ppqueue = "ppqueue.__main__:main" diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index cd35e25..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -tqdm==4.62.3 -pandas==1.1.5 -plotnine==0.8.0 From 3602bc13e31f750c3fb39af99a76a55fbff962be Mon Sep 17 00:00:00 2001 From: Donald Mellenbruch Date: Thu, 22 Jun 2023 00:00:00 -0500 Subject: [PATCH 2/2] docs: update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 704639e..f487a11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 0.3.0 - rename from `ezpq` to `ppqueue` - replaced `queue.get` with `queue.dequeue` / `queue.pop`