July 2024 - openSUSE Commits - openSUSE Mailing Lists

commit openjdk-22-image for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjdk-22-image for openSUSE:Factory checked in at 2024-07-11 20:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjdk-22-image (Old) and /work/SRC/openSUSE:Factory/.openjdk-22-image.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjdk-22-image" Thu Jul 11 20:33:15 2024 rev:8 rq:1186799 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openjdk-22-image/openjdk-22-image.changes 2024-06-25 23:10:03.299943163 +0200 +++ /work/SRC/openSUSE:Factory/.openjdk-22-image.new.17339/openjdk-22-image.changes 2024-07-11 20:33:57.882582099 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 08:17:40 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com> + +- extend README.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.GPhgYU/_old 2024-07-11 20:33:58.362599455 +0200 +++ /var/tmp/diff_new_pack.GPhgYU/_new 2024-07-11 20:33:58.366599599 +0200 @@ -1,7 +1,61 @@ -# The openSUSE Tumbleweed BCI OpenJDK 22 runtime container image +# OpenJDK 22 runtime container image + ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) -OpenJDK 22 runtime container based on the openSUSE Tumbleweed Base Container Image. +## Description + +[OpenJDK](https://openjdk.org/) (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). OpenJDK is the official reference implementation of Java SE since version 7. + +The OpenJDK runtime image is intended to be used as a runtime environment. For development, use the OpenJDK development image. + +## Usage + +To run a jar or war application inside a container instance, use the following command: + +```ShellSession +$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/openjdk:22 java -jar hello.jar +``` + +Or create a new contained based on OpenJDK 22 runtime image: + +```Dockerfile +FROM registry.opensuse.org/opensuse/bci/openjdk:22 + +WORKDIR /app + +COPY . ./ + +CMD ["java", "-jar", "hello.jar"] +``` + +To compile and deploy an application, copy the sources and build the application: + +```Dockerfile +# Build the application using the OpenJDK development image +FROM registry.suse.com/bci/openjdk-devel:22 as build + +WORKDIR /app + +COPY . ./ + +RUN javac Hello.java + +# Bundle the application into OpenJDK runtime image +FROM registry.opensuse.org/opensuse/bci/openjdk:22 + +WORKDIR /app + +COPY --from=build /app/Hello.class /app + +CMD ["java", "Hello"] +``` + +Build and run the container image: + +```ShellSession +$ podman build -t my-java-app . +$ podman run -it --rm my-java-app +``` ## Licensing

1 0

commit openjdk-22-devel-image for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjdk-22-devel-image for openSUSE:Factory checked in at 2024-07-11 20:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjdk-22-devel-image (Old) and /work/SRC/openSUSE:Factory/.openjdk-22-devel-image.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjdk-22-devel-image" Thu Jul 11 20:33:15 2024 rev:9 rq:1186798 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openjdk-22-devel-image/openjdk-22-devel-image.changes 2024-06-28 15:52:34.470088125 +0200 +++ /work/SRC/openSUSE:Factory/.openjdk-22-devel-image.new.17339/openjdk-22-devel-image.changes 2024-07-11 20:33:57.066552595 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 08:17:40 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com> + +- extend README.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.5ujVMP/_old 2024-07-11 20:33:57.750577327 +0200 +++ /var/tmp/diff_new_pack.5ujVMP/_new 2024-07-11 20:33:57.754577471 +0200 @@ -1,7 +1,62 @@ -# The openSUSE Tumbleweed BCI OpenJDK 22 development container image +# OpenJDK 22 development container image + ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) -OpenJDK 22 development container based on the openSUSE Tumbleweed Base Container Image. +## Description + +[OpenJDK](https://openjdk.org/) (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). OpenJDK is the official reference implementation of Java SE since version 7. + +The OpenJDK development image is intended to be used as a build environment. For runtime, use the OpenJDK runtime image. + +## Usage + +The default command for the image is the Java Shell tool (JShell). + +```ShellSession +$ podman run -it --rm registry.opensuse.org/opensuse/bci/openjdk-devel:22 +jshell> /help +``` + +To compile and deploy an application, copy the sources and build the binary: + +```Dockerfile +# Build the application using the OpenJDK development image +FROM registry.opensuse.org/opensuse/bci/openjdk-devel:22 as build + +WORKDIR /app + +COPY . ./ + +RUN javac Hello.java + +# Bundle the application into OpenJDK runtime image +FROM registry.suse.com/bci/openjdk:22 + +WORKDIR /app + +COPY --from=build /app/Hello.class /app + +CMD ["java", "Hello"] +``` + +Build and run the container image: + +```ShellSession +$ podman build -t my-java-app . +$ podman run -it --rm my-java-app +``` + +There are situations, where you don't want to run an application inside a container. + +To compile the application, without running it inside a container instance, use the following command: + +```ShellSession +$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/openjdk-devel:22 javac Hello.java +``` + +## Additional tools + +The OpenJDK 22 development image includes [Git](https://git-scm.com/) and [Apache Maven](https://maven.apache.org/). [Apache Ant](https://ant.apache.org/) is available in the repositories. ## Licensing

1 0

commit openjdk-17-image for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjdk-17-image for openSUSE:Factory checked in at 2024-07-11 20:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjdk-17-image (Old) and /work/SRC/openSUSE:Factory/.openjdk-17-image.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjdk-17-image" Thu Jul 11 20:33:13 2024 rev:12 rq:1186795 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openjdk-17-image/openjdk-17-image.changes 2024-06-25 23:10:00.663847071 +0200 +++ /work/SRC/openSUSE:Factory/.openjdk-17-image.new.17339/openjdk-17-image.changes 2024-07-11 20:33:55.170484041 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 08:17:40 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com> + +- extend README.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.7Z1ZNi/_old 2024-07-11 20:33:55.734504434 +0200 +++ /var/tmp/diff_new_pack.7Z1ZNi/_new 2024-07-11 20:33:55.738504578 +0200 @@ -1,7 +1,61 @@ -# The openSUSE Tumbleweed BCI OpenJDK 17 runtime container image +# OpenJDK 17 runtime container image + ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) -OpenJDK 17 runtime container based on the openSUSE Tumbleweed Base Container Image. +## Description + +[OpenJDK](https://openjdk.org/) (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). OpenJDK is the official reference implementation of Java SE since version 7. + +The OpenJDK runtime image is intended to be used as a runtime environment. For development, use the OpenJDK development image. + +## Usage + +To run a jar or war application inside a container instance, use the following command: + +```ShellSession +$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/openjdk:17 java -jar hello.jar +``` + +Or create a new contained based on OpenJDK 17 runtime image: + +```Dockerfile +FROM registry.opensuse.org/opensuse/bci/openjdk:17 + +WORKDIR /app + +COPY . ./ + +CMD ["java", "-jar", "hello.jar"] +``` + +To compile and deploy an application, copy the sources and build the application: + +```Dockerfile +# Build the application using the OpenJDK development image +FROM registry.suse.com/bci/openjdk-devel:17 as build + +WORKDIR /app + +COPY . ./ + +RUN javac Hello.java + +# Bundle the application into OpenJDK runtime image +FROM registry.opensuse.org/opensuse/bci/openjdk:17 + +WORKDIR /app + +COPY --from=build /app/Hello.class /app + +CMD ["java", "Hello"] +``` + +Build and run the container image: + +```ShellSession +$ podman build -t my-java-app . +$ podman run -it --rm my-java-app +``` ## Licensing

1 0

commit openjdk-17-devel-image for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjdk-17-devel-image for openSUSE:Factory checked in at 2024-07-11 20:33:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjdk-17-devel-image (Old) and /work/SRC/openSUSE:Factory/.openjdk-17-devel-image.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjdk-17-devel-image" Thu Jul 11 20:33:12 2024 rev:13 rq:1186794 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openjdk-17-devel-image/openjdk-17-devel-image.changes 2024-06-28 15:52:22.857663331 +0200 +++ /work/SRC/openSUSE:Factory/.openjdk-17-devel-image.new.17339/openjdk-17-devel-image.changes 2024-07-11 20:33:54.494459599 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 08:17:40 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com> + +- extend README.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.BkQf7h/_old 2024-07-11 20:33:54.974476955 +0200 +++ /var/tmp/diff_new_pack.BkQf7h/_new 2024-07-11 20:33:54.978477099 +0200 @@ -1,7 +1,62 @@ -# The openSUSE Tumbleweed BCI OpenJDK 17 development container image +# OpenJDK 17 development container image + ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) -OpenJDK 17 development container based on the openSUSE Tumbleweed Base Container Image. +## Description + +[OpenJDK](https://openjdk.org/) (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). OpenJDK is the official reference implementation of Java SE since version 7. + +The OpenJDK development image is intended to be used as a build environment. For runtime, use the OpenJDK runtime image. + +## Usage + +The default command for the image is the Java Shell tool (JShell). + +```ShellSession +$ podman run -it --rm registry.opensuse.org/opensuse/bci/openjdk-devel:17 +jshell> /help +``` + +To compile and deploy an application, copy the sources and build the binary: + +```Dockerfile +# Build the application using the OpenJDK development image +FROM registry.opensuse.org/opensuse/bci/openjdk-devel:17 as build + +WORKDIR /app + +COPY . ./ + +RUN javac Hello.java + +# Bundle the application into OpenJDK runtime image +FROM registry.suse.com/bci/openjdk:17 + +WORKDIR /app + +COPY --from=build /app/Hello.class /app + +CMD ["java", "Hello"] +``` + +Build and run the container image: + +```ShellSession +$ podman build -t my-java-app . +$ podman run -it --rm my-java-app +``` + +There are situations, where you don't want to run an application inside a container. + +To compile the application, without running it inside a container instance, use the following command: + +```ShellSession +$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/openjdk-devel:17 javac Hello.java +``` + +## Additional tools + +The OpenJDK 17 development image includes [Git](https://git-scm.com/) and [Apache Maven](https://maven.apache.org/). [Apache Ant](https://ant.apache.org/) is available in the repositories. ## Licensing

1 0

commit openjdk-11-devel-image for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjdk-11-devel-image for openSUSE:Factory checked in at 2024-07-11 20:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjdk-11-devel-image (Old) and /work/SRC/openSUSE:Factory/.openjdk-11-devel-image.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjdk-11-devel-image" Thu Jul 11 20:33:11 2024 rev:12 rq:1186792 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openjdk-11-devel-image/openjdk-11-devel-image.changes 2024-06-28 15:52:18.501503979 +0200 +++ /work/SRC/openSUSE:Factory/.openjdk-11-devel-image.new.17339/openjdk-11-devel-image.changes 2024-07-11 20:33:52.854400301 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 08:17:41 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi(a)suse.com> + +- extend README.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README.md ++++++ --- /var/tmp/diff_new_pack.MJxIRY/_old 2024-07-11 20:33:53.538425033 +0200 +++ /var/tmp/diff_new_pack.MJxIRY/_new 2024-07-11 20:33:53.542425178 +0200 @@ -1,7 +1,62 @@ -# The openSUSE Tumbleweed BCI OpenJDK 11 development container image +# OpenJDK 11 development container image + ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green) -OpenJDK 11 development container based on the openSUSE Tumbleweed Base Container Image. +## Description + +[OpenJDK](https://openjdk.org/) (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). OpenJDK is the official reference implementation of Java SE since version 7. + +The OpenJDK development image is intended to be used as a build environment. For runtime, use the OpenJDK runtime image. + +## Usage + +The default command for the image is the Java Shell tool (JShell). + +```ShellSession +$ podman run -it --rm registry.opensuse.org/opensuse/bci/openjdk-devel:11 +jshell> /help +``` + +To compile and deploy an application, copy the sources and build the binary: + +```Dockerfile +# Build the application using the OpenJDK development image +FROM registry.opensuse.org/opensuse/bci/openjdk-devel:11 as build + +WORKDIR /app + +COPY . ./ + +RUN javac Hello.java + +# Bundle the application into OpenJDK runtime image +FROM registry.suse.com/bci/openjdk:11 + +WORKDIR /app + +COPY --from=build /app/Hello.class /app + +CMD ["java", "Hello"] +``` + +Build and run the container image: + +```ShellSession +$ podman build -t my-java-app . +$ podman run -it --rm my-java-app +``` + +There are situations, where you don't want to run an application inside a container. + +To compile the application, without running it inside a container instance, use the following command: + +```ShellSession +$ podman run --rm -v "$PWD":/app:Z -w /app registry.opensuse.org/opensuse/bci/openjdk-devel:11 javac Hello.java +``` + +## Additional tools + +The OpenJDK 11 development image includes [Git](https://git-scm.com/) and [Apache Maven](https://maven.apache.org/). [Apache Ant](https://ant.apache.org/) is available in the repositories. ## Licensing

1 0

commit python-fabio for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-fabio for openSUSE:Factory checked in at 2024-07-11 20:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-fabio (Old) and /work/SRC/openSUSE:Factory/.python-fabio.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-fabio" Thu Jul 11 20:33:07 2024 rev:7 rq:1186778 version:2024.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-fabio/python-fabio.changes 2024-03-06 23:04:42.781707693 +0100 +++ /work/SRC/openSUSE:Factory/.python-fabio.new.17339/python-fabio.changes 2024-07-11 20:33:47.542208236 +0200 @@ -1,0 +2,9 @@ +Thu Jul 4 07:20:42 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 2024.4: + * Support for new style GE-files (contribution from Patrick Avery) + * Support sparse frames without background (for XPCS) + * Support for Numpy v2.0 + * Support Python 3.7-3.12 + +------------------------------------------------------------------- Old: ---- fabio-2023.10.tar.gz New: ---- fabio-2024.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-fabio.spec ++++++ --- /var/tmp/diff_new_pack.9k83R9/_old 2024-07-11 20:33:48.730251190 +0200 +++ /var/tmp/diff_new_pack.9k83R9/_new 2024-07-11 20:33:48.738251480 +0200 @@ -16,9 +16,9 @@ # -%define pyversion 2023.10.0 +%define pyversion 2024.4.0 Name: python-fabio -Version: 2023.10 +Version: 2024.4 Release: 0 Summary: Image IO for images produced by 2D X-ray detectors License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT @@ -59,13 +59,11 @@ find src -name '*.py' -and ! -path src/fabio/_version.py -exec sed -i '1{/^#!/d}' '{}' ';' -exec chmod -x '{}' ';' %build -%{python_expand # _version.py is called during meson build -sed -i '1{s|^#!.*$|#!%{__$python}|}' src/fabio/_version.py -%{$python_pyproject_wheel} -} +%pyproject_wheel %install %pyproject_install +%python_expand sed -i '1{s|^#!.*$|#!%{__$python}|}' %{buildroot}%{$python_sitearch}/fabio/version.py %python_clone -a %{buildroot}%{_bindir}/densify_Bragg %python_clone -a %{buildroot}%{_bindir}/fabio-convert %python_clone -a %{buildroot}%{_bindir}/fabio_viewer ++++++ fabio-2023.10.tar.gz -> fabio-2024.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/.github/workflows/python-package.yml new/fabio-2024.4/.github/workflows/python-package.yml --- old/fabio-2023.10/.github/workflows/python-package.yml 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/.github/workflows/python-package.yml 2024-04-11 16:35:31.000000000 +0200 @@ -15,7 +15,7 @@ runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/.github/workflows/release.yml new/fabio-2024.4/.github/workflows/release.yml --- old/fabio-2023.10/.github/workflows/release.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fabio-2024.4/.github/workflows/release.yml 2024-04-11 16:35:31.000000000 +0200 @@ -0,0 +1,147 @@ +name: Build and deploy + +on: + workflow_dispatch: + release: + types: + - published + +jobs: + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + cache: "pip" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install build twine + - name: Build sdist + run: python -m build --sdist + - name: Check the package + run: python -m twine check dist/* + - uses: actions/upload-artifact@v4 + with: + name: cibw-sdist + path: dist/*.tar.gz + + test_sdist: + needs: [build_sdist] + name: Test source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + cache: "pip" + - uses: actions/download-artifact@v4 + with: + name: cibw-sdist + path: dist + - name: Install from sdist + run: pip install "$(ls dist/fabio-*.tar.gz)" + - name: Run tests + run: python -c "import fabio.test, sys; sys.exit(fabio.test.run_tests())" + + build_doc: + name: Build documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + cache: "pip" + - name: Install pandoc&graphviz + run: sudo apt-get install pandoc graphviz + - name: Install fabio + run: pip install . + - name: Install documentation dependencies + run: pip install -r requirements.txt + - name: Build doc + env: + READTHEDOCS: "True" # To skip checking that fabio is installed locally + run: | + export FABIO_VERSION="$(python -c 'import fabio; print(fabio.strictversion)')" + sphinx-build doc/source/ "fabio-${FABIO_VERSION}_documentation/" + zip -r "fabio-${FABIO_VERSION}_documentation.zip" "fabio-${FABIO_VERSION}_documentation/" + - uses: actions/upload-artifact@v4 + with: + name: documentation + path: fabio-*_documentation.zip + + build_wheels: + name: Build wheels on ${{ matrix.os }}-${{ matrix.cibw_archs }} + runs-on: ${{ matrix.os }} + strategy: + # Ensure that a wheel builder finishes even if another fails + fail-fast: false + matrix: + include: + - os: ubuntu-20.04 + cibw_archs: "auto64" + - os: ubuntu-20.04 + cibw_archs: "aarch64" + - os: ubuntu-20.04 + cibw_archs: "ppc64le" + - os: windows-2019 + cibw_archs: "auto64" + - os: macos-11 + cibw_archs: "x86_64" + macos_target: "10.9" + - os: macos-14 + cibw_archs: "arm64" + macos_target: "11.0" + + steps: + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + if: runner.os == 'Linux' + with: + platforms: all + - uses: pypa/cibuildwheel(a)v2.16.5 + env: + # Use silx wheelhouse: needed for ppc64le + CIBW_ENVIRONMENT_LINUX: "PIP_FIND_LINKS=https://www.silx.org/pub/wheelhouse/ PIP_TRUSTED_HOST=www.silx.org" + + CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* + # Do not build for pypy and muslinux + CIBW_SKIP: pp* *-musllinux_* + CIBW_ARCHS: ${{ matrix.cibw_archs }} + + MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}" + + # Install test dependencies + CIBW_TEST_COMMAND: python -c "import fabio.test, sys; sys.exit(fabio.test.run_tests())" + # Skip tests for emulated architectures + # and Python3.8 on macos/arm64 (https://github.com/pypa/cibuildwheel/pull/1169) + CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} cp38-macosx_arm64" + + - uses: actions/upload-artifact@v4 + with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} + path: ./wheelhouse/*.whl + + pypi-publish: + needs: [build_doc, build_sdist, build_wheels, test_sdist] + name: Upload release to PyPI + runs-on: ubuntu-latest + environment: + name: pypi + permissions: + id-token: write + if: github.event_name == 'release' && github.event.action == 'published' + # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this) + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + steps: + - uses: actions/download-artifact@v4 + with: + pattern: cibw-* + path: dist + merge-multiple: true + - uses: pypa/gh-action-pypi-publish@release/v1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/bootstrap.py new/fabio-2024.4/bootstrap.py --- old/fabio-2023.10/bootstrap.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/bootstrap.py 2024-04-11 16:35:31.000000000 +0200 @@ -10,7 +10,7 @@ __authors__ = ["Frédéric-Emmanuel Picca", "Jérôme Kieffer"] __contact__ = "jerome.kieffer(a)esrf.eu" __license__ = "MIT" -__date__ = "03/03/2023" +__date__ = "11/04/2024" import sys import os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/build-deb.sh new/fabio-2024.4/build-deb.sh --- old/fabio-2023.10/build-deb.sh 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/build-deb.sh 2024-04-11 16:35:31.000000000 +0200 @@ -29,9 +29,9 @@ project=fabio source_project=fabio -version=$(PYTHONPATH=src/fabio python3 -c"import _version; print(_version.version)") -strictversion=$(PYTHONPATH=src/fabio python3 -c"import _version; print(_version.strictversion)") -debianversion=$(PYTHONPATH=src/fabio python3 -c"import _version; print(_version.debianversion)") +version=$(PYTHONPATH=src/fabio python3 -c"import version; print(version.version)") +strictversion=$(PYTHONPATH=src/fabio python3 -c"import version; print(version.strictversion)") +debianversion=$(PYTHONPATH=src/fabio python3 -c"import version; print(version.debianversion)") deb_name=$(echo "$source_project" | tr '[:upper:]' '[:lower:]') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/doc/source/Changelog.rst new/fabio-2024.4/doc/source/Changelog.rst --- old/fabio-2023.10/doc/source/Changelog.rst 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/doc/source/Changelog.rst 2024-04-11 16:35:31.000000000 +0200 @@ -1,6 +1,15 @@ Changelog ========= +FabIO-2024.4.0: +................ +- Support for new style GE-files (contribution from Patrick Avery) +- Support sparse frames without background +- Fix documentation (Thanks Wout) +- Automatize the release (Thanks Thomas) +- Support for Numpy v2.0 +- Support Python 3.7-3.12 + FabIO-2023.10.0: ................ - New tutorial on the ccreation of multiframe Tiff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/doc/source/conf.py new/fabio-2024.4/doc/source/conf.py --- old/fabio-2023.10/doc/source/conf.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/doc/source/conf.py 2024-04-11 16:35:31.000000000 +0200 @@ -13,10 +13,7 @@ import sys import os -import glob -import subprocess -on_rtd = os.environ.get('READTHEDOCS') == 'True' # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -26,7 +23,7 @@ import fabio project_dir = os.path.abspath(os.path.join(__file__, "..", "..", "..")) build_dir = os.path.abspath(fabio.__file__) - if on_rtd: + if os.environ.get('READTHEDOCS') == 'True': print("On Read The Docs") print("build_dir", build_dir) print("project_dir", project_dir) @@ -55,19 +52,11 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', + 'sphinx_rtd_theme', 'sphinxcontrib.programoutput', - "nbsphinx" + 'nbsphinx' ] -# Set the theme to sphinx_rtd_theme when *not* building on Read The Docs. -# The theme is set to default otherwise as Read The Docs uses its own theme anyway. -if not on_rtd: - try: - import sphinx_rtd_theme - extensions.append('sphinx_rtd_theme') - except: - print("sphinx_rtd_theme is not available") - # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -81,7 +70,7 @@ master_doc = 'index' # General information about the project. -from fabio._version import strictversion, version, __date__ as fabio_date +from fabio.version import strictversion, __date__ as fabio_date year = fabio_date.split("/")[-1] copyright = u'2006-%s, Henning Sorensen, Erik Knudsen, Jon Wright, Gael Goret, Brian Pauw and Jerome Kieffer' % (year) @@ -136,7 +125,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' if on_rtd else 'sphinx_rtd_theme' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/doc/source/coverage.rst new/fabio-2024.4/doc/source/coverage.rst --- old/fabio-2023.10/doc/source/coverage.rst 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/doc/source/coverage.rst 2024-04-11 16:35:31.000000000 +0200 @@ -1,18 +1,17 @@ Test coverage report for fabio ============================== -Measured on *fabio* version 2023.10.0, 25/10/2023 +Measured on *fabio* version 2024.4.0, 11/04/2024 .. csv-table:: Test suite coverage :header: "Name", "Stmts", "Exec", "Cover" :widths: 35, 8, 8, 8 - "GEimage.py", "106", "80", "75.5 %" + "GEimage.py", "116", "90", "77.6 %" "HiPiCimage.py", "61", "54", "88.5 %" "OXDimage.py", "352", "325", "92.3 %" - "TiffIO.py", "781", "648", "83.0 %" - "__init__.py", "35", "29", "82.9 %" - "_version.py", "40", "39", "97.5 %" + "TiffIO.py", "781", "643", "82.3 %" + "__init__.py", "34", "28", "82.4 %" "adscimage.py", "4", "4", "100.0 %" "binaryimage.py", "60", "44", "73.3 %" "bruker100image.py", "286", "243", "85.0 %" @@ -25,14 +24,14 @@ "eigerimage.py", "194", "139", "71.6 %" "esperantoimage.py", "158", "137", "86.7 %" "fabioformats.py", "90", "65", "72.2 %" - "fabioimage.py", "467", "386", "82.7 %" - "fabioutils.py", "392", "316", "80.6 %" + "fabioimage.py", "468", "387", "82.7 %" + "fabioutils.py", "392", "312", "79.6 %" "file_series.py", "370", "280", "75.7 %" "fit2dimage.py", "91", "76", "83.5 %" "fit2dmaskimage.py", "79", "75", "94.9 %" "fit2dspreadsheetimage.py", "47", "40", "85.1 %" "hdf5image.py", "98", "67", "68.4 %" - "jpeg2kimage.py", "82", "56", "68.3 %" + "jpeg2kimage.py", "82", "74", "90.2 %" "jpegimage.py", "47", "45", "95.7 %" "kcdimage.py", "107", "76", "71.0 %" "limaimage.py", "180", "151", "83.9 %" @@ -42,14 +41,15 @@ "mrcimage.py", "85", "65", "76.5 %" "nexus.py", "233", "130", "55.8 %" "numpyimage.py", "77", "53", "68.8 %" - "openimage.py", "122", "105", "86.1 %" + "openimage.py", "130", "112", "86.2 %" "pilatusimage.py", "43", "38", "88.4 %" "pixiimage.py", "107", "91", "85.0 %" "pnmimage.py", "137", "86", "62.8 %" "raxisimage.py", "103", "91", "88.3 %" - "sparseimage.py", "135", "93", "68.9 %" + "sparseimage.py", "146", "97", "66.4 %" "speimage.py", "162", "157", "96.9 %" "tifimage.py", "128", "121", "94.5 %" + "version.py", "40", "35", "87.5 %" "xcaliburimage.py", "586", "462", "78.8 %" "xsdimage.py", "94", "70", "74.5 %" "app/__init__.py", "0", "0", "0.0 %" @@ -58,10 +58,12 @@ "compression/agi_bitfield.py", "171", "148", "86.5 %" "compression/compression.py", "245", "188", "76.7 %" "ext/__init__.py", "0", "0", "0.0 %" - "utils/ExternalResources.py", "180", "133", "73.9 %" + "test/__init__.py", "22", "15", "68.2 %" + "test/codecs/__init__.py", "87", "81", "93.1 %" + "utils/ExternalResources.py", "181", "134", "74.0 %" "utils/__init__.py", "0", "0", "0.0 %" - "utils/cli.py", "60", "52", "86.7 %" + "utils/cli.py", "60", "48", "80.0 %" "utils/deprecation.py", "67", "63", "94.0 %" "utils/pilutils.py", "49", "39", "79.6 %" - "fabio total", "9609", "7542", "78.5 %" + "fabio total", "9748", "7661", "78.6 %" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/meson.build new/fabio-2024.4/meson.build --- old/fabio-2023.10/meson.build 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/meson.build 2024-04-11 16:35:31.000000000 +0200 @@ -2,7 +2,7 @@ 'c', 'cython', license: 'MIT', meson_version: '>= 0.60', - version: run_command('src/fabio/_version.py', + version: run_command(['version.py', '--wheel'], check:true).stdout().strip(), ) @@ -13,6 +13,7 @@ endif cc = meson.get_compiler('c') +cy = meson.get_compiler('cython') m_dep = cc.find_library('m', required : false) if m_dep.found() add_project_link_arguments('-lm', language : 'c') @@ -23,4 +24,11 @@ py = py_mod.find_installation() py_dep = py.dependency() +py.install_sources([ + 'version.py', +], + pure: false, # Will be installed next to binaries + subdir: 'fabio' # Folder relative to site-packages to install to +) + subdir('src/fabio') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/package/debian12/control new/fabio-2024.4/package/debian12/control --- old/fabio-2023.10/package/debian12/control 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/package/debian12/control 2024-04-11 16:35:31.000000000 +0200 @@ -7,6 +7,9 @@ Build-Depends: cython3, debhelper, dh-python, + devscripts, + python3-tomli, + python3-mesonpy, python3-all-dev, python3-pil, python3-lxml, @@ -18,10 +21,7 @@ python3-sphinxcontrib.programoutput, python3-sphinx-rtd-theme, python3-h5py, - python3-tomli, - python3-mesonpy, help2man, - devscripts, python3-pyqt5, python3-matplotlib, bitshuffle, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/package/debian12/rules new/fabio-2024.4/package/debian12/rules --- old/fabio-2023.10/package/debian12/rules 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/package/debian12/rules 2024-04-11 16:35:31.000000000 +0200 @@ -38,3 +38,7 @@ python3 build-doc.py dh_installdocs "build/sphinx" -p fabio-doc dh_installdocs + +override_dh_sphinxdoc: + dh_sphinxdoc -X searchtools.js + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/pyproject.toml new/fabio-2024.4/pyproject.toml --- old/fabio-2023.10/pyproject.toml 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/pyproject.toml 2024-04-11 16:35:31.000000000 +0200 @@ -54,15 +54,13 @@ "meson; platform_system!='Windows'", 'ninja', 'wheel', - 'numpy', - 'Cython>=0.25', - 'numpy', + 'Cython>=0.29', 'pyproject-metadata>=0.5.0', 'tomli>=1.0.0' ] [project.urls] -homepage = 'http://silx.org' +homepage = 'http://www.silx.org' documentation = 'http://www.silx.org/doc/fabio/latest/' source = 'https://github.com/silx-kit/fabio' download = 'https://github.com/silx-kit/fabio/releases' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/requirements.txt new/fabio-2024.4/requirements.txt --- old/fabio-2023.10/requirements.txt 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/requirements.txt 2024-04-11 16:35:31.000000000 +0200 @@ -11,3 +11,4 @@ sphinx sphinxcontrib-programoutput sphinx-rtd-theme +nbsphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/GEimage.py new/fabio-2024.4/src/fabio/GEimage.py --- old/fabio-2023.10/src/fabio/GEimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/GEimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -41,8 +41,12 @@ import io import numpy import struct +from .edfimage import EdfImage from .fabioimage import FabioImage from .fabioutils import next_filename, previous_filename +from .openimage import MAGIC_NUMBERS + +EDF_MAGIC_NUMBERS = [(x, y) for x, y in MAGIC_NUMBERS if y == 'edf'] GE_HEADER_INFO = [ # Name, length in bytes, format for struct (None means string) @@ -265,6 +269,20 @@ raise IOError("GE file size is incorrect") nframes = file_size // bytes_per_frames self.header['NumberOfFrames'] = nframes + elif any(self.header["ImageFormat"].startswith(x) for x, _ in EDF_MAGIC_NUMBERS): + # At APS, they started saving some GE headers with an EDF format in ~2022 + + # Use the same metadata as the blank header... + self.header.update(self.BLANKED_HEADER_METADATA) + + # Read the EDF header + cur = infile.tell() + infile.seek(0) + header = EdfImage._read_header_block(infile, 1) + infile.seek(cur, io.SEEK_SET) + + # Extract any needed info from the EDF header + self.header['NumberOfFrames'] = int(header[0]["Num_Images"]) def read(self, fname, frame=None): """Read header into self.header and the data into self.data.""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/OXDimage.py new/fabio-2024.4/src/fabio/OXDimage.py --- old/fabio-2023.10/src/fabio/OXDimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/OXDimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -482,7 +482,7 @@ dim2 = self._shape[0] while pos_inp < stream_size and pos_out < array_size: if pos_out % dim2 == 0: - last = 0 + last = numpy.int64(0) else: last = current value = raw[pos_inp] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/__init__.py new/fabio-2024.4/src/fabio/__init__.py --- old/fabio-2023.10/src/fabio/__init__.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/__init__.py 2024-04-11 16:35:31.000000000 +0200 @@ -28,7 +28,7 @@ __contact__ = "Jerome.Kieffer(a)ESRF.eu" __license__ = "GPLv3+" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "21/06/2023" +__date__ = "15/03/2024" __status__ = "stable" import sys @@ -39,8 +39,7 @@ logging.basicConfig() import os -from ._version import __date__ as date # noqa -from ._version import version, version_info, hexversion, strictversion # noqa +from .version import __date__ as date, version, version_info, hexversion, strictversion # noqa from . import fabioformats as _fabioformats # provide a global fabio API diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/_version.py new/fabio-2024.4/src/fabio/_version.py --- old/fabio-2023.10/src/fabio/_version.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/_version.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,124 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 -# -# Project: X-ray image reader -# https://github.com/silx-kit/fabio -# -# Copyright (C) 2015-20230 European Synchrotron Radiation Facility, Grenoble, France -# -# Principal author: Jérôme Kieffer (Jerome.Kieffer(a)ESRF.eu) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -"""Unique place where the version number is defined. - -Module for version handling: - -provides: -* version = "1.2.3" or "1.2.3-beta4" -* version_info = named tuple (1,2,3,"beta",4) -* hexversion: 0x010203B4 -* strictversion = "1.2.3b4 -* debianversion = "1.2.3~beta4" -* calc_hexversion: the function to transform a version_tuple into an integer - -This is called hexversion since it only really looks meaningful when viewed as the -result of passing it to the built-in hex() function. -The version_info value may be used for a more human-friendly encoding of the same information. - -The hexversion is a 32-bit number with the following layout: -Bits (big endian order) Meaning -1-8 PY_MAJOR_VERSION (the 2 in 2.1.0a3) -9-16 PY_MINOR_VERSION (the 1 in 2.1.0a3) -17-24 PY_MICRO_VERSION (the 0 in 2.1.0a3) -25-28 PY_RELEASE_LEVEL (0xA for alpha, 0xB for beta, 0xC for release candidate and 0xF for final) -29-32 PY_RELEASE_SERIAL (the 3 in 2.1.0a3, zero for final releases) - -Thus 2.1.0a3 is hexversion 0x020100a3. - -""" - -__author__ = "Jérôme Kieffer" -__contact__ = "Jerome.Kieffer(a)ESRF.eu" -__license__ = "MIT" -__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "07/08/2023" -__status__ = "production" -__docformat__ = 'restructuredtext' -__all__ = ["date", "version_info", "strictversion", "hexversion", "debianversion", - "calc_hexversion"] - -RELEASE_LEVEL_VALUE = {"dev": 0, - "alpha": 10, - "beta": 11, - "candidate": 12, - "final": 15} - -PRERELEASE_NORMALIZED_NAME = {"dev": "a", - "alpha": "a", - "beta": "b", - "candidate": "rc"} - -MAJOR = 2023 -MINOR = 10 -MICRO = 0 -RELEV = "final" # <16 -SERIAL = 0 # <16 -date = __date__ - -from collections import namedtuple -_version_info = namedtuple("version_info", ["major", "minor", "micro", "releaselevel", "serial"]) - -version_info = _version_info(MAJOR, MINOR, MICRO, RELEV, SERIAL) - -strictversion = version = debianversion = "%d.%d.%d" % version_info[:3] -if version_info.releaselevel != "final": - _prerelease = PRERELEASE_NORMALIZED_NAME[version_info[3]] - version += "%s%s" % (_prerelease, version_info[-1]) - debianversion += "~adev%i" % version_info[-1] if RELEV == "dev" else "~%s%i" % (_prerelease, version_info[-1]) - strictversion += _prerelease + str(version_info[-1]) - - -def calc_hexversion(major=0, minor=0, micro=0, releaselevel="dev", serial=0): - """Calculate the hexadecimal version number from the tuple version_info: - - :param major: integer - :param minor: integer - :param micro: integer - :param relev: integer or string - :param serial: integer - :return: integer always increasing with revision numbers - """ - try: - releaselevel = int(releaselevel) - except ValueError: - releaselevel = RELEASE_LEVEL_VALUE.get(releaselevel, 0) - - hex_version = int(serial) - hex_version |= releaselevel * 1 << 4 - hex_version |= int(micro) * 1 << 8 - hex_version |= int(minor) * 1 << 16 - hex_version |= int(major) * 1 << 24 - return hex_version - - -hexversion = calc_hexversion(*version_info) - -if __name__ == "__main__": - print(version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/app/eiger2crysalis.py new/fabio-2024.4/src/fabio/app/eiger2crysalis.py --- old/fabio-2023.10/src/fabio/app/eiger2crysalis.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/app/eiger2crysalis.py 2024-04-11 16:35:31.000000000 +0200 @@ -38,7 +38,7 @@ __author__ = "Jerome Kieffer" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" __licence__ = "MIT" -__date__ = "23/02/2023" +__date__ = "15/03/2024" __status__ = "production" FOOTER = """To import your files as a project: @@ -401,7 +401,7 @@ ":param full: complete/slow mask analysis" if self.progress: self.progress.update(self.progress.max_value - 1, "Generate mask") - dummy_value = numpy.cast[self.mask.dtype](-1) + dummy_value = numpy.asarray(-numpy.ones(1), dtype=self.mask.dtype)[-1] #-1 in the given datatype mask = (self.mask==dummy_value).astype(numpy.int8) esperantoimage.EsperantoImage.DUMMY = 1 new_mask = self.geometry_transform(esperantoimage.EsperantoImage(data=mask).data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/cbfimage.py new/fabio-2024.4/src/fabio/cbfimage.py --- old/fabio-2023.10/src/fabio/cbfimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/cbfimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -245,7 +245,7 @@ return binary_data if ("Content-MD5" in self.header) and check_MD5: - ref = numpy.string_(self.header["Content-MD5"]) + ref = numpy.bytes_(self.header["Content-MD5"]) obt = md5sum(binary_data) if ref != obt: logger.error("Checksum of binary data mismatch: expected %s, got %s" % (ref, obt)) @@ -294,14 +294,14 @@ b"Content-Type: application/octet-stream;", b' conversions="x-CBF_BYTE_OFFSET"', b'Content-Transfer-Encoding: BINARY', - numpy.string_("X-Binary-Size: %d" % (len(binary_blob))), + numpy.bytes_("X-Binary-Size: %d" % (len(binary_blob))), b"X-Binary-ID: 1", - numpy.string_('X-Binary-Element-Type: "%s"' % (dtype)), + numpy.bytes_('X-Binary-Element-Type: "%s"' % (dtype)), b"X-Binary-Element-Byte-Order: LITTLE_ENDIAN", b"Content-MD5: " + md5sum(binary_blob), - numpy.string_("X-Binary-Number-of-Elements: %d" % (dim1 * dim2)), - numpy.string_("X-Binary-Size-Fastest-Dimension: %d" % dim1), - numpy.string_("X-Binary-Size-Second-Dimension: %d" % dim2), + numpy.bytes_("X-Binary-Number-of-Elements: %d" % (dim1 * dim2)), + numpy.bytes_("X-Binary-Size-Fastest-Dimension: %d" % dim1), + numpy.bytes_("X-Binary-Size-Second-Dimension: %d" % dim2), b"X-Binary-Size-Padding: 1", b"", self.STARTER + binary_blob, @@ -354,22 +354,22 @@ keys are always unicode (str in python3) values are bytes """ - EOL = [numpy.string_(i) for i in ("\r", "\n", "\r\n", "\n\r")] - BLANK = [numpy.string_(i) for i in (" ", "\t")] + EOL - SINGLE_QUOTE = numpy.string_("'") - DOUBLE_QUOTE = numpy.string_('"') - SEMICOLUMN = numpy.string_(';') - DOT = numpy.string_('.') + EOL = [numpy.bytes_(i) for i in ("\r", "\n", "\r\n", "\n\r")] + BLANK = [numpy.bytes_(i) for i in (" ", "\t")] + EOL + SINGLE_QUOTE = numpy.bytes_("'") + DOUBLE_QUOTE = numpy.bytes_('"') + SEMICOLUMN = numpy.bytes_(';') + DOT = numpy.bytes_('.') START_COMMENT = (SINGLE_QUOTE, DOUBLE_QUOTE) - BINARY_MARKER = numpy.string_("--CIF-BINARY-FORMAT-SECTION--") - HASH = numpy.string_("#") - LOOP = numpy.string_("loop_") + BINARY_MARKER = numpy.bytes_("--CIF-BINARY-FORMAT-SECTION--") + HASH = numpy.bytes_("#") + LOOP = numpy.bytes_("loop_") UNDERSCORE = ord("_") - QUESTIONMARK = numpy.string_("?") - STOP = numpy.string_("stop_") - GLOBAL = numpy.string_("global_") - DATA = numpy.string_("data_") - SAVE = numpy.string_("save_") + QUESTIONMARK = numpy.bytes_("?") + STOP = numpy.bytes_("stop_") + GLOBAL = numpy.bytes_("global_") + DATA = numpy.bytes_("data_") + SAVE = numpy.bytes_("save_") def __init__(self, _strFilename=None): """ @@ -416,7 +416,7 @@ else: raise RuntimeError("CIF.loadCIF: what is %s type %s" % (_strFilename, type(_strFilename))) if _bKeepComment: - self._parseCIF(numpy.string_(infile.read())) + self._parseCIF(numpy.bytes_(infile.read())) else: self._parseCIF(CIF._readCIF(infile)) if own_fd: @@ -454,13 +454,13 @@ if "read" not in dir(instream): raise RuntimeError("CIF._readCIF(instream): I expected instream to be an opened file,\ here I got %s type %s" % (instream, type(instream))) - out_bytes = numpy.string_("") + out_bytes = numpy.bytes_("") for sLine in instream: - nline = numpy.string_(sLine) + nline = numpy.bytes_(sLine) pos = nline.find(cls.HASH) if pos >= 0: if cls.isAscii(nline): - out_bytes += nline[:pos] + numpy.string_(os.linesep) + out_bytes += nline[:pos] + numpy.bytes_(os.linesep) if pos > 80: logger.warning("This line is too long and could cause problems in PreQuest: %s", sLine) else: @@ -535,7 +535,7 @@ idx += 1 + bytes_text[idx + 1:].find(cls.SINGLE_QUOTE) if idx >= len(bytes_text) - 1: fields.append(bytes_text[1:-1].strip()) - bytes_text = numpy.string_("") + bytes_text = numpy.bytes_("") finished = True break @@ -552,7 +552,7 @@ idx += 1 + bytes_text[idx + 1:].find(cls.DOUBLE_QUOTE) if idx >= len(bytes_text) - 1: fields.append(bytes_text[1:-1].strip()) - bytes_text = numpy.string_("") + bytes_text = numpy.bytes_("") finished = True break @@ -594,7 +594,7 @@ bytes_text = bytes_text[end_binary:].strip() else: fields.append(bytes_text) - bytes_text = numpy.string_("") + bytes_text = numpy.bytes_("") break return fields diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/eigerimage.py new/fabio-2024.4/src/fabio/eigerimage.py --- old/fabio-2023.10/src/fabio/eigerimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/eigerimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -2,7 +2,7 @@ # # Project: FabIO X-ray image reader # -# Copyright (C) 2010-2016 European Synchrotron Radiation Facility +# Copyright (C) 2010-2024 European Synchrotron Radiation Facility # Grenoble, France # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -45,7 +45,7 @@ __contact__ = "jerome.kieffer(a)esrf.fr" __license__ = "MIT" __copyright__ = "ESRF" -__date__ = "05/07/2022" +__date__ = "15/03/2024" import logging logger = logging.getLogger(__name__) @@ -184,7 +184,7 @@ for i, ds in enumerate(self.dataset): if ds is None: # we are in a trouble - data = numpy.atleast_2d(numpy.NaN) + data = numpy.atleast_2d(numpy.nan) elif isinstance(ds, h5py.Dataset): data = numpy.atleat_2d(ds[()]) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/ext/dense.pyx new/fabio-2024.4/src/fabio/ext/dense.pyx --- old/fabio-2023.10/src/fabio/ext/dense.pyx 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/ext/dense.pyx 2024-04-11 16:35:31.000000000 +0200 @@ -8,7 +8,7 @@ # Project: Fable Input/Output # https://github.com/silx-kit/fabio # -# Copyright (C) 2020-2023 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2020-2024 European Synchrotron Radiation Facility, Grenoble, France # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ """Densification of sparse frame format """ __author__ = "Jérôme Kieffer" -__date__ = "20/10/2023" +__date__ = "19/03/2024" __contact__ = "Jerome.kieffer(a)esrf.fr" __license__ = "MIT" @@ -249,12 +249,15 @@ cdef: Py_ssize_t i, j, size, pos, size_over, width, height double value, fres, fpos, idelta, start, std - bint integral, noisy, do_normalization=False + bint integral, noisy, do_normalization=False, do_background=True any_t[:, ::1] dense float[:,::1] c_normalization MT mt - size = radius.shape[0] - assert background.shape[0] == size + if radius is None: + do_background = False + else: + size = radius.shape[0] + assert background.shape[0] == size size_over = index.shape[0] assert intensity.shape[0] == size_over integral = numpy.issubdtype(dtype, numpy.integer) @@ -277,36 +280,37 @@ mt = MT(seed) with nogil: - start = radius[0] - idelta = <double>(size - 1)/(radius[size-1] - start) - - #Linear interpolation - for i in range(height): - for j in range(width): - fpos = (mask[i,j] - start)*idelta - if (fpos<0) or (fpos>=size) or (not isfinite(fpos)): - dense[i,j] = dummy - else: - pos = <uint32_t> fpos - if pos+1 == size: - value = background[pos] - fres = 0.0 + if do_background: + start = radius[0] + idelta = <double>(size - 1)/(radius[size-1] - start) + + #Linear interpolation + for i in range(height): + for j in range(width): + fpos = (mask[i,j] - start)*idelta + if (fpos<0) or (fpos>=size) or (not isfinite(fpos)): + dense[i,j] = dummy else: - fres = fpos - pos - value = (1.0 - fres)*background[pos] + fres*background[pos+1] - if noisy: + pos = <uint32_t> fpos if pos+1 == size: - std = background_std[pos] + value = background[pos] fres = 0.0 else: - std = (1.0 - fres)*background_std[pos] + fres*background_std[pos+1] - value = max(0.0, mt._normal_m(value, std)) - if do_normalization: - value *= c_normalization[i, j] - if integral: - dense[i,j] = <any_t>(value + 0.5) #this is rounding - else: - dense[i,j] = <any_t>(value) + fres = fpos - pos + value = (1.0 - fres)*background[pos] + fres*background[pos+1] + if noisy: + if pos+1 == size: + std = background_std[pos] + fres = 0.0 + else: + std = (1.0 - fres)*background_std[pos] + fres*background_std[pos+1] + value = max(0.0, mt._normal_m(value, std)) + if do_normalization: + value *= c_normalization[i, j] + if integral: + dense[i,j] = <any_t>(value + 0.5) #this is rounding + else: + dense[i,j] = <any_t>(value) # Assignment of outliers for i in range(size_over): j = index[i] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/fabioimage.py new/fabio-2024.4/src/fabio/fabioimage.py --- old/fabio-2023.10/src/fabio/fabioimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/fabioimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -816,6 +816,7 @@ fobj.seek(0) elif self._need_a_seek_to_read and mode[0] == "r": fo = python_uncompress(fname, mode) + print(fname, mode, fo) fobj = fabioutils.BytesIO(fo.read(), fname, mode) else: fobj = python_uncompress(fname, mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/meson.build new/fabio-2024.4/src/fabio/meson.build --- old/fabio-2023.10/src/fabio/meson.build 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/meson.build 2024-04-11 16:35:31.000000000 +0200 @@ -6,7 +6,6 @@ subdir('utils') py.install_sources([ - '_version.py', 'adscimage.py', 'binaryimage.py', 'bruker100image.py', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/nexus.py new/fabio-2024.4/src/fabio/nexus.py --- old/fabio-2023.10/src/fabio/nexus.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/nexus.py 2024-04-11 16:35:31.000000000 +0200 @@ -29,11 +29,11 @@ """ -__author__ = "Jerome Kieffer" +__author__ = "Jérôme Kieffer" __contact__ = "Jerome.Kieffer(a)ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "28/04/2021" +__date__ = "15/03/2024" __status__ = "production" __docformat__ = 'restructuredtext' @@ -44,7 +44,7 @@ import time import numpy from .fabioutils import exists -from ._version import version +from .version import version logger = logging.getLogger(__name__) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/openimage.py new/fabio-2024.4/src/fabio/openimage.py --- old/fabio-2023.10/src/fabio/openimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/openimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -42,7 +42,9 @@ import os.path import logging +import re from . import fabioutils +from .compression import ExternalCompressors from .fabioutils import FilenameObject, BytesIO from .fabioimage import FabioImage @@ -149,6 +151,18 @@ return "marccd" else: return "tif" + + if format_type == "edf" and isinstance(filename, str): + # Might be GE with an EDF header. Check the extension. + extension = filename.split(".")[-1] + # If it is a compression extension, check the next one up. + if f'.{extension}' in ExternalCompressors.COMMANDS: + extension = filename.split(".")[-2] + + # If the extension is `ge` plus a number, assume it is GE + if re.search(r'^ge\d*$', extension): + return "GE" + return format_type raise Exception("Could not interpret magic string") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/sparseimage.py new/fabio-2024.4/src/fabio/sparseimage.py --- old/fabio-2023.10/src/fabio/sparseimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/sparseimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -3,7 +3,7 @@ # Project: X-ray image reader # https://github.com/silx-kit/fabio # -# Copyright 2020-2021(C) European Synchrotron Radiation Facility, Grenoble, France +# Copyright 2020-2024(C) European Synchrotron Radiation Facility, Grenoble, France # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files @@ -37,7 +37,7 @@ __contact__ = "jerome.kieffer(a)esrf.fr" __license__ = "MIT" __copyright__ = "2020 ESRF" -__date__ = "09/02/2023" +__date__ = "19/03/2024" import logging logger = logging.getLogger(__name__) @@ -82,7 +82,11 @@ :param seed: numerical seed for random number generator :return dense array """ - dense = numpy.interp(mask, radius, background) + dtype = intensity.dtype + if radius is None or background is None: + dense = numpy.zeros(radius.shape, dtype=dtype) + else: + dense = numpy.interp(mask, radius, background) if background_std is not None: if seed is not None: numpy.random.seed(seed) @@ -93,7 +97,7 @@ flat = dense.ravel() flat[index] = intensity - dtype = intensity.dtype + if numpy.issubdtype(dtype, numpy.integer): # Foolded by banker's rounding !!!! dense +=0.5 @@ -173,9 +177,13 @@ raise NotGoodReader("HDF5 file does not contain any default NXdata.") nx_data = entry[default_data] self.mask = nx_data["mask"][()] - self.radius = nx_data["radius"][()] - self.background_avg = nx_data["background_avg"][()] - self.background_std = nx_data["background_std"][()] + try: + self.radius = nx_data["radius"][()] + self.background_avg = nx_data["background_avg"][()] + self.background_std = nx_data["background_std"][()] + except KeyError: + logger.info("No background information found") + self.radius = self.background_avg = self.background_std = None self.frame_ptr = nx_data["frame_ptr"][()] self.index = nx_data["index"][()] self.intensity = nx_data["intensity"][()] @@ -183,7 +191,7 @@ self.dummy = self.intensity.dtype.type(nx_data["dummy"][()]) except KeyError: if self.intensity.dtype.char in numpy.typecodes['AllFloat']: - self.dummy = numpy.NaN + self.dummy = numpy.nan else: self.dummy = 0 @@ -205,19 +213,29 @@ logger.warning("Not data have been read from disk") return start, stop = self.frame_ptr[index:index + 2] - if cython_densify is not None: - return cython_densify.densify(self.mask, - self.radius, - self.index[start:stop], - self.intensity[start:stop], - self.dummy, - self.intensity.dtype, - self.background_avg[index], - self.background_std[index] * self.noisy if self.noisy else None, - self.normalization) + if self.radius is None: + if cython_densify is None: # Numpy implementation + dense = densify(self.mask, + None, + self.index[start:stop], + self.intensity[start:stop], + self.dummy, + None, + None, + self.normalization) + else: # Cython + dense = cython_densify.densify(self.mask, + None, + self.index[start:stop], + self.intensity[start:stop], + self.dummy, + self.intensity.dtype, + None, + None, + self.normalization) else: - # Fall-back on numpy code. - return densify(self.mask, + if cython_densify is None: # Numpy + dense = densify(self.mask, self.radius, self.index[start:stop], self.intensity[start:stop], @@ -225,7 +243,18 @@ self.background_avg[index], self.background_std[index] * self.noisy if self.noisy else None, self.normalization) - + else: + dense = cython_densify.densify(self.mask, + self.radius, + self.index[start:stop], + self.intensity[start:stop], + self.dummy, + self.intensity.dtype, + self.background_avg[index], + self.background_std[index] * self.noisy if self.noisy else None, + self.normalization) + return dense + def getframe(self, num): """ returns the frame numbered 'num' in the stack if applicable""" if self.nframes > 1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/test/codecs/test_esperantoimage.py new/fabio-2024.4/src/fabio/test/codecs/test_esperantoimage.py --- old/fabio-2023.10/src/fabio/test/codecs/test_esperantoimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/test/codecs/test_esperantoimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -134,7 +134,7 @@ def test_values(self): esp = fabio.open(UtilsTest.getimage("reference.esperanto.bz2")[:-4]) npy = fabio.open(UtilsTest.getimage("reference.npy.bz2")[:-4]) - self.assertEqual(numpy.alltrue(esp.data == npy.data), True, "Images are the same") + self.assertTrue(numpy.array_equal(esp.data, npy.data), "Images are the same") def suite(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/test/codecs/test_geimage.py new/fabio-2024.4/src/fabio/test/codecs/test_geimage.py --- old/fabio-2023.10/src/fabio/test/codecs/test_geimage.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/test/codecs/test_geimage.py 2024-04-11 16:35:31.000000000 +0200 @@ -53,6 +53,7 @@ ("GE_aSI_detector_image_1529", (2048, 2048), (1515, 16353, 1833.0311, 56.9124)), ("GE_image_1frame_intact_header.ge", (2048, 2048), (1515, 16353, 2209.1113, 437.6377)), ("GE_image_1frame_blanked_header.ge", (2048, 2048), (1300, 16349, 1886.41111, 117.0603)), + ("dark_before_000428.edf.ge5", (2048, 2048), (1300, 16349, 1833.87892, 84.5265)), ] def setUp(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/utils/ExternalResources.py new/fabio-2024.4/src/fabio/utils/ExternalResources.py --- old/fabio-2023.10/src/fabio/utils/ExternalResources.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/utils/ExternalResources.py 2024-04-11 16:35:31.000000000 +0200 @@ -289,7 +289,8 @@ if not gz_file_exists: try: - gzip.open(fullimagename_gz, "wb").write(decompressed) + with gzip.open(fullimagename_gz, "wb") as g: + g.write(decompressed) except IOError: raise IOError("unable to write gzipped \ data to disk at %s" % self.data_home) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/src/fabio/utils/deprecation.py new/fabio-2024.4/src/fabio/utils/deprecation.py --- old/fabio-2023.10/src/fabio/utils/deprecation.py 2023-10-26 10:30:27.000000000 +0200 +++ new/fabio-2024.4/src/fabio/utils/deprecation.py 2024-04-11 16:35:31.000000000 +0200 @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2016-2017 European Synchrotron Radiation Facility +# Copyright (c) 2016-2024 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -24,15 +24,16 @@ # ###########################################################################*/ """Bunch of useful decorators""" -__authors__ = ["Jerome Kieffer", "H. Payno", "P. Knobel"] +__authors__ = ["Jérôme Kieffer", "H. Payno", "P. Knobel"] __license__ = "MIT" -__date__ = "18/12/2020" +__date__ = "15/03/2024" import logging import functools import traceback import re -from .. import _version + +from ..version import calc_hexversion, hexversion as ref_hexversion depreclog = logging.getLogger("fabio.DEPRECATION") @@ -54,7 +55,7 @@ releaselevel = result[3] if releaselevel is None: releaselevel = 0 - return _version.calc_hexversion(major, minor, micro, releaselevel, serial=0) + return calc_hexversion(major, minor, micro, releaselevel, serial=0) def deprecated(func=None, reason=None, replacement=None, since_version=None, @@ -154,7 +155,7 @@ deprecated_since = hexversion else: deprecated_since = _CACHE_VERSIONS[deprecated_since] - log_as_debug = _version.hexversion < deprecated_since + log_as_debug = ref_hexversion < deprecated_since else: log_as_debug = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fabio-2023.10/version.py new/fabio-2024.4/version.py --- old/fabio-2023.10/version.py 1970-01-01 01:00:00.000000000 +0100 +++ new/fabio-2024.4/version.py 2024-04-11 16:35:31.000000000 +0200 @@ -0,0 +1,124 @@ +#!/usr/bin/env python3 +# coding: utf-8 +# +# Project: X-ray image reader +# https://github.com/silx-kit/fabio +# +# Copyright (C) 2015-2024 European Synchrotron Radiation Facility, Grenoble, France +# +# Principal author: Jérôme Kieffer (Jerome.Kieffer(a)ESRF.eu) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +"""Unique place where the version number is defined. + +Module for version handling: + +provides: +* version = "1.2.3" or "1.2.3-beta4" +* version_info = named tuple (1,2,3,"beta",4) +* hexversion: 0x010203B4 +* strictversion = "1.2.3b4 +* debianversion = "1.2.3~beta4" +* calc_hexversion: the function to transform a version_tuple into an integer + +This is called hexversion since it only really looks meaningful when viewed as the +result of passing it to the built-in hex() function. +The version_info value may be used for a more human-friendly encoding of the same information. + +The hexversion is a 32-bit number with the following layout: +Bits (big endian order) Meaning +1-8 PY_MAJOR_VERSION (the 2 in 2.1.0a3) +9-16 PY_MINOR_VERSION (the 1 in 2.1.0a3) +17-24 PY_MICRO_VERSION (the 0 in 2.1.0a3) +25-28 PY_RELEASE_LEVEL (0xA for alpha, 0xB for beta, 0xC for release candidate and 0xF for final) +29-32 PY_RELEASE_SERIAL (the 3 in 2.1.0a3, zero for final releases) + +Thus 2.1.0a3 is hexversion 0x020100a3. + +""" + +__author__ = "Jérôme Kieffer" +__contact__ = "Jerome.Kieffer(a)ESRF.eu" +__license__ = "MIT" +__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" +__date__ = "11/04/2024" +__status__ = "production" +__docformat__ = 'restructuredtext' +__all__ = ["date", "version_info", "strictversion", "hexversion", "debianversion", + "calc_hexversion"] + +RELEASE_LEVEL_VALUE = {"dev": 0, + "alpha": 10, + "beta": 11, + "candidate": 12, + "final": 15} + +PRERELEASE_NORMALIZED_NAME = {"dev": "a", + "alpha": "a", + "beta": "b", + "candidate": "rc"} + +MAJOR = 2024 +MINOR = 4 +MICRO = 0 +RELEV = "final" # <16 +SERIAL = 0 # <16 +date = __date__ + +from collections import namedtuple +_version_info = namedtuple("version_info", ["major", "minor", "micro", "releaselevel", "serial"]) + +version_info = _version_info(MAJOR, MINOR, MICRO, RELEV, SERIAL) + +strictversion = version = debianversion = "%d.%d.%d" % version_info[:3] +if version_info.releaselevel != "final": + _prerelease = PRERELEASE_NORMALIZED_NAME[version_info[3]] + version += "%s%s" % (_prerelease, version_info[-1]) + debianversion += "~adev%i" % version_info[-1] if RELEV == "dev" else "~%s%i" % (_prerelease, version_info[-1]) + strictversion += _prerelease + str(version_info[-1]) + + +def calc_hexversion(major=0, minor=0, micro=0, releaselevel="dev", serial=0): + """Calculate the hexadecimal version number from the tuple version_info: + + :param major: integer + :param minor: integer + :param micro: integer + :param relev: integer or string + :param serial: integer + :return: integer always increasing with revision numbers + """ + try: + releaselevel = int(releaselevel) + except ValueError: + releaselevel = RELEASE_LEVEL_VALUE.get(releaselevel, 0) + + hex_version = int(serial) + hex_version |= releaselevel * 1 << 4 + hex_version |= int(micro) * 1 << 8 + hex_version |= int(minor) * 1 << 16 + hex_version |= int(major) * 1 << 24 + return hex_version + + +hexversion = calc_hexversion(*version_info) + +if __name__ == "__main__": + print(version)

1 0

commit helm-docs for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package helm-docs for openSUSE:Factory checked in at 2024-07-11 20:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helm-docs (Old) and /work/SRC/openSUSE:Factory/.helm-docs.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "helm-docs" Thu Jul 11 20:33:04 2024 rev:9 rq:1186775 version:1.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/helm-docs/helm-docs.changes 2024-03-17 22:16:50.946258216 +0100 +++ /work/SRC/openSUSE:Factory/.helm-docs.new.17339/helm-docs.changes 2024-07-11 20:33:45.198123484 +0200 @@ -1,0 +2,41 @@ +Thu Jul 11 07:44:40 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.14.2: + * Release v1.14.2 + * fix: Adds check for tag format to release script, also makes + release script error on improper tags + * chore(deps): bump helm.sh/helm/v3 from 3.15.1 to 3.15.2 + +------------------------------------------------------------------- +Thu Jul 11 07:43:11 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.14.1: + * Release 1.14.1 + * Update go.mod via 'go mod tidy' + * chore: generates documentation using new v1.14.0 + +------------------------------------------------------------------- +Thu Jul 11 07:13:34 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.14.0: + * Release 1.14.0 + * fix: Fixes goreleaser action by using new flag + * chore(deps): bump github.com/stretchr/testify from 1.8.3 to + 1.9.0 + * chore(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.1 + * chore(deps): bump goreleaser/goreleaser-action from 4 to 6 + * chore(deps): bump alpine from 3.19 to 3.20 + * chore(deps): bump docker/setup-buildx-action from 2 to 3 + * chore(deps): bump docker/setup-qemu-action from 2 to 3 + * chore(deps): bump crazy-max/ghaction-import-gpg from 5 to 6 + * Add dependabot + * Use helm v3 + * revert go.mod + * add toYaml example + * add example + * chore: set go version to 1.22.0 + * chore: renders example chart documentation using v1.13.1 + * add a flag to remove the version footer + * feat: add toYaml and fromYaml to functions map + +------------------------------------------------------------------- Old: ---- helm-docs-1.13.1.obscpio New: ---- helm-docs-1.14.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helm-docs.spec ++++++ --- /var/tmp/diff_new_pack.Y0MoC7/_old 2024-07-11 20:33:45.734142865 +0200 +++ /var/tmp/diff_new_pack.Y0MoC7/_new 2024-07-11 20:33:45.734142865 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: helm-docs -Version: 1.13.1 +Version: 1.14.2 Release: 0 Summary: A tool for automatically generating markdown documentation for helm charts License: GPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Y0MoC7/_old 2024-07-11 20:33:45.766144021 +0200 +++ /var/tmp/diff_new_pack.Y0MoC7/_new 2024-07-11 20:33:45.770144165 +0200 @@ -3,11 +3,11 @@ <param name="url">https://github.com/norwoodj/helm-docs</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.13.1</param> + <param name="revision">v1.14.2</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="match-tag">v1.13.1</param> + <param name="match-tag">v1.14.2</param> </service> <service name="set_version" mode="manual"> <param name="basename">helm-docs</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Y0MoC7/_old 2024-07-11 20:33:45.790144889 +0200 +++ /var/tmp/diff_new_pack.Y0MoC7/_new 2024-07-11 20:33:45.794145033 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/norwoodj/helm-docs</param> - <param name="changesrevision">a66bb9c69c0bb38ff86ec7dccb1c11e7b70654c0</param></service></servicedata> + <param name="changesrevision">37d3055fece566105cf8cff7c17b7b2355a01677</param></service></servicedata> (No newline at EOF) ++++++ helm-docs-1.13.1.obscpio -> helm-docs-1.14.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/.github/dependabot.yml new/helm-docs-1.14.2/.github/dependabot.yml --- old/helm-docs-1.13.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/.github/dependabot.yml 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,16 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + + - package-ecosystem: gomod + directory: / + schedule: + interval: weekly + + - package-ecosystem: docker + directory: / + schedule: + interval: weekly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/.github/workflows/build.yml new/helm-docs-1.14.2/.github/workflows/build.yml --- old/helm-docs-1.13.1/.github/workflows/build.yml 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/.github/workflows/build.yml 2024-07-08 12:13:38.000000000 +0200 @@ -16,16 +16,16 @@ DOCKER_CLI_EXPERIMENTAL: "enabled" steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version-file: go.mod - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: - args: release --snapshot --skip-sign + args: release --snapshot --skip=sign - if: always() run: rm -f ${HOME}/.docker/config.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/.github/workflows/release.yml new/helm-docs-1.14.2/.github/workflows/release.yml --- old/helm-docs-1.13.1/.github/workflows/release.yml 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/.github/workflows/release.yml 2024-07-08 12:13:38.000000000 +0200 @@ -3,7 +3,7 @@ on: push: tags: - - "*" + - "v*" jobs: release: @@ -12,9 +12,9 @@ DOCKER_CLI_EXPERIMENTAL: "enabled" steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: @@ -25,12 +25,12 @@ - name: Import GPG key if: ${{ !env.ACT }} id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 + uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.SIGNING_KEY }} - name: Release Helm-Docs if: ${{ !env.ACT }} - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: args: release env: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/.goreleaser.yml new/helm-docs-1.14.2/.goreleaser.yml --- old/helm-docs-1.13.1/.goreleaser.yml 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/.goreleaser.yml 2024-07-08 12:13:38.000000000 +0200 @@ -1,3 +1,4 @@ +version: 2 project_name: helm-docs before: hooks: @@ -66,7 +67,7 @@ - repository: owner: norwoodj name: homebrew - folder: Formula + directory: Formula homepage: https://github.com/norwoodj/helm-docs description: Automatically generate markdown documentation for helm charts install: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/CHANGELOG.md new/helm-docs-1.14.2/CHANGELOG.md --- old/helm-docs-1.13.1/CHANGELOG.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/CHANGELOG.md 2024-07-08 12:13:38.000000000 +0200 @@ -1,3 +1,49 @@ +1.14.2 +- 2024-07-08 Release v1.14.2 +- 2024-07-08 fix: Adds check for tag format to release script, also makes release script error on improper tags +- 2024-07-08 Merge pull request #251 from norwoodj/dependabot/go_modules/helm.sh/helm/v3-3.15.2 +- 2024-07-08 chore(deps): bump helm.sh/helm/v3 from 3.15.1 to 3.15.2 + +1.14.1 +- 2024-07-08 Release 1.14.1 +- 2024-07-08 Merge pull request #248 from WePlan-Software/master +- 2024-07-08 Update go.mod via 'go mod tidy' +- 2024-07-06 chore: generates documentation using new v1.14.0 + +1.14.0 +- 2024-07-06 Release 1.14.0 +- 2024-07-06 Merge pull request #237 from norwoodj/dependabot/github_actions/docker/setup-qemu-action-3 +- 2024-07-06 chore(deps): bump docker/setup-qemu-action from 2 to 3 +- 2024-07-06 Merge pull request #236 from norwoodj/dependabot/github_actions/crazy-max/ghaction-import-gpg-6 +- 2024-07-06 chore(deps): bump crazy-max/ghaction-import-gpg from 5 to 6 +- 2024-07-06 Merge pull request #238 from norwoodj/dependabot/docker/alpine-3.20 +- 2024-07-06 chore(deps): bump alpine from 3.19 to 3.20 +- 2024-07-06 Merge pull request #239 from norwoodj/dependabot/github_actions/docker/setup-buildx-action-3 +- 2024-07-06 chore(deps): bump docker/setup-buildx-action from 2 to 3 +- 2024-07-06 Merge pull request #246 from norwoodj/jnorwood/fix-goreleaser +- 2024-07-06 fix: Fixes goreleaser action by using new flag +- 2024-07-06 Merge pull request #240 from norwoodj/dependabot/github_actions/goreleaser/goreleaser-action-6 +- 2024-07-06 chore(deps): bump goreleaser/goreleaser-action from 4 to 6 +- 2024-07-06 Merge pull request #220 from gbprz/skip-helm-version-footer +- 2024-02-27 add a flag to remove the version footer +- 2024-07-06 Merge pull request #230 from ebuildy/feat_yaml_functions +- 2024-05-11 revert go.mod +- 2024-05-11 add toYaml example +- 2024-05-11 add example +- 2024-07-06 Merge pull request #176 from jasondamour/master +- 2023-03-29 feat: add toYaml and fromYaml to functions map +- 2024-07-06 Merge pull request #243 from norwoodj/dependabot/go_modules/github.com/spf13/cobra-1.8.1 +- 2024-07-06 chore(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.1 +- 2024-07-06 Merge pull request #244 from norwoodj/dependabot/go_modules/github.com/stretchr/testify-1.9.0 +- 2024-07-06 chore(deps): bump github.com/stretchr/testify from 1.8.3 to 1.9.0 +- 2024-07-06 Merge pull request #232 from lucacome/helm3 +- 2024-05-30 Use helm v3 +- 2024-07-06 Merge pull request #233 from lucacome/dependabot +- 2024-05-30 Add dependabot +- 2024-05-12 Merge pull request #224 from ebuildy/fix_go_mod_version +- 2024-03-28 chore: set go version to 1.22.0 +- 2024-03-02 chore: renders example chart documentation using v1.13.1 + 1.13.1 - 2024-03-02 Release v1.13.1 - 2024-03-02 chore: updates golang.org/x/crypto to fix vulnerability diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/Dockerfile new/helm-docs-1.14.2/Dockerfile --- old/helm-docs-1.13.1/Dockerfile 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/Dockerfile 2024-07-08 12:13:38.000000000 +0200 @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.20 COPY helm-docs /usr/bin/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/Makefile new/helm-docs-1.14.2/Makefile --- old/helm-docs-1.13.1/Makefile 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/Makefile 2024-07-08 12:13:38.000000000 +0200 @@ -18,4 +18,4 @@ .PHONY: dist dist: - goreleaser release --rm-dist --snapshot --skip-sign + goreleaser release --rm-dist --snapshot --skip=sign diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/cmd/helm-docs/command_line.go new/helm-docs-1.14.2/cmd/helm-docs/command_line.go --- old/helm-docs-1.13.1/cmd/helm-docs/command_line.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/cmd/helm-docs/command_line.go 2024-07-08 12:13:38.000000000 +0200 @@ -59,6 +59,7 @@ command.PersistentFlags().BoolP("documentation-strict-mode", "x", false, "Fail the generation of docs if there are undocumented values") command.PersistentFlags().StringSliceP("documentation-strict-ignore-absent", "y", []string{"service.type", "image.repository", "image.tag"}, "A comma separate values which are allowed not to be documented in strict mode") command.PersistentFlags().StringSliceP("documentation-strict-ignore-absent-regex", "z", []string{".*service\\.type", ".*image\\.repository", ".*image\\.tag"}, "A comma separate values which are allowed not to be documented in strict mode") + command.PersistentFlags().Bool("skip-version-footer", false, "if true the helm-docs version footer will not be shown in the default README template") viper.AutomaticEnv() viper.SetEnvPrefix("HELM_DOCS") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/cmd/helm-docs/main.go new/helm-docs-1.14.2/cmd/helm-docs/main.go --- old/helm-docs-1.13.1/cmd/helm-docs/main.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/cmd/helm-docs/main.go 2024-07-08 12:13:38.000000000 +0200 @@ -145,6 +145,7 @@ func writeDocumentation(chartSearchRoot string, documentationInfoByChartPath map[string]helm.ChartDocumentationInfo, dryRun bool, parallelism int) { templateFiles := viper.GetStringSlice("template-files") badgeStyle := viper.GetString("badge-style") + skipVersionFooter := viper.GetBool("skip-version-footer") log.Debugf("Rendering from optional template files [%s]", strings.Join(templateFiles, ", ")) @@ -162,7 +163,7 @@ return } } - document.PrintDocumentation(info, chartSearchRoot, templateFiles, dryRun, version, badgeStyle, dependencyValues) + document.PrintDocumentation(info, chartSearchRoot, templateFiles, dryRun, version, badgeStyle, dependencyValues, skipVersionFooter) }) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/cmd/helm-docs/main_test.go new/helm-docs-1.14.2/cmd/helm-docs/main_test.go --- old/helm-docs-1.13.1/cmd/helm-docs/main_test.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/cmd/helm-docs/main_test.go 2024-07-08 12:13:38.000000000 +0200 @@ -6,6 +6,7 @@ "io/fs" "os" "path/filepath" + "strings" "testing" "github.com/spf13/viper" @@ -148,3 +149,81 @@ return tmp } + +func TestSkipsVersionFooter(t *testing.T) { + // Ensure the skip-version-footer flag is true, meaning the README should not contain the footer. + if err := viper.BindFlagValues(testFlagSet{ + "chart-search-root": filepath.Join("testdata", "skip-version-footer"), + "template-files": "README.md.gotmpl", + "values-file": "values.yaml", + "output-file": "README.md", + "ignore-file": ".helmdocsignore", + "log-level": "warn", + "sort-values-order": document.AlphaNumSortOrder, + "document-dependency-values": true, + "skip-version-footer": true, + }); err != nil { + t.Fatal(err) + } + + // Clean up the generated README after testing. + readmePath := filepath.Join("testdata", "skip-version-footer", "README.md") + t.Cleanup(func() { + if err := os.Remove(readmePath); err != nil { + t.Fatal(err) + } + }) + + // Generate the README, setting the helm-docs version number. + version = "1.2.3" + helmDocs(nil, nil) + + // Confirm the helm-docs version is not present. + docBytes, err := os.ReadFile(readmePath) + if err != nil { + t.Fatal(err) + } + doc := string(docBytes) + if strings.Contains(doc, "Autogenerated from chart metadata using [helm-docs v1.2.3]") { + t.Errorf("generated documentation should not contain the helm-docs version footer, got %s", doc) + } +} + +func TestIncludesVersionFooter(t *testing.T) { + // Ensure the skip-version-footer flag is true, meaning the README must contain the footer. + if err := viper.BindFlagValues(testFlagSet{ + "chart-search-root": filepath.Join("testdata", "skip-version-footer"), + "template-files": "README.md.gotmpl", + "values-file": "values.yaml", + "output-file": "README.md", + "ignore-file": ".helmdocsignore", + "log-level": "warn", + "sort-values-order": document.AlphaNumSortOrder, + "document-dependency-values": true, + "skip-version-footer": false, + }); err != nil { + t.Fatal(err) + } + + // Clean up the generated README after testing. + readmePath := filepath.Join("testdata", "skip-version-footer", "README.md") + t.Cleanup(func() { + if err := os.Remove(readmePath); err != nil { + t.Fatal(err) + } + }) + + // Generate the README, setting the helm-docs version number. + version = "1.2.3" + helmDocs(nil, nil) + + // Confirm the helm-docs version is present + docBytes, err := os.ReadFile(readmePath) + if err != nil { + t.Fatal(err) + } + doc := string(docBytes) + if !strings.Contains(doc, "Autogenerated from chart metadata using [helm-docs v1.2.3]") { + t.Errorf("generated documentation must contain the helm-docs version footer, got %s", doc) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/cmd/helm-docs/testdata/skip-version-footer/Chart.yaml new/helm-docs-1.14.2/cmd/helm-docs/testdata/skip-version-footer/Chart.yaml --- old/helm-docs-1.13.1/cmd/helm-docs/testdata/skip-version-footer/Chart.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/cmd/helm-docs/testdata/skip-version-footer/Chart.yaml 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,4 @@ +apiVersion: v2 +name: skip-version-footer +description: unit test for skipping the version footer +version: "0.1.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/cmd/helm-docs/testdata/skip-version-footer/values.yaml new/helm-docs-1.14.2/cmd/helm-docs/testdata/skip-version-footer/values.yaml --- old/helm-docs-1.13.1/cmd/helm-docs/testdata/skip-version-footer/values.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/cmd/helm-docs/testdata/skip-version-footer/values.yaml 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,4 @@ +config: + databasesToCreate: + # -- default database for storage of database metadata + - postgresql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/best-values-example/README.md new/helm-docs-1.14.2/example-charts/best-values-example/README.md --- old/helm-docs-1.13.1/example-charts/best-values-example/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/best-values-example/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -31,4 +31,4 @@ | statefulset.podLabels | object | `{}` | The labels to be applied to instances of the database | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/custom-template/README.md new/helm-docs-1.14.2/example-charts/custom-template/README.md --- old/helm-docs-1.13.1/example-charts/custom-template/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/custom-template/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -59,4 +59,4 @@ | controller.service.type | string | `"LoadBalancer"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/custom-value-notation-type/README.md new/helm-docs-1.14.2/example-charts/custom-value-notation-type/README.md --- old/helm-docs-1.13.1/example-charts/custom-value-notation-type/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/custom-value-notation-type/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -1105,4 +1105,4 @@ </table> ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/dos-line-endings/README.md new/helm-docs-1.14.2/example-charts/dos-line-endings/README.md --- old/helm-docs-1.13.1/example-charts/dos-line-endings/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/dos-line-endings/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -14,4 +14,4 @@ | livenessProbe.httpGet.port | string | `"http"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/files-values/README.md new/helm-docs-1.14.2/example-charts/files-values/README.md --- old/helm-docs-1.13.1/example-charts/files-values/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/files-values/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -68,4 +68,4 @@ | statefulset.podLabels | object | `{}` | The labels to be applied to instances of the database | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/full-template/README.md new/helm-docs-1.14.2/example-charts/full-template/README.md --- old/helm-docs-1.13.1/example-charts/full-template/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/full-template/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -163,4 +163,4 @@ | controller.service.type | string | `"LoadBalancer"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/fully-documented/README.md new/helm-docs-1.14.2/example-charts/fully-documented/README.md --- old/helm-docs-1.13.1/example-charts/fully-documented/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/fully-documented/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -33,4 +33,4 @@ | controller.name | string | `"controller"` | The name of the controller | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/funky-version/README.md new/helm-docs-1.14.2/example-charts/funky-version/README.md --- old/helm-docs-1.13.1/example-charts/funky-version/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/funky-version/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -17,4 +17,4 @@ * <https://github.com/norwoodj/helm-docs/tree/master/example-charts/funky-vers…> ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/helm-3/README.md new/helm-docs-1.14.2/example-charts/helm-3/README.md --- old/helm-docs-1.13.1/example-charts/helm-3/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/helm-3/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -41,4 +41,4 @@ | controller.service.type | string | `"LoadBalancer"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/ignored-values-example/README.md new/helm-docs-1.14.2/example-charts/ignored-values-example/README.md --- old/helm-docs-1.13.1/example-charts/ignored-values-example/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/ignored-values-example/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -32,4 +32,4 @@ | statefulset.podLabels | object | `{}` | The labels to be applied to instances of the database | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/most-empty/README.md new/helm-docs-1.14.2/example-charts/most-empty/README.md --- old/helm-docs-1.13.1/example-charts/most-empty/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/most-empty/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -21,4 +21,4 @@ ``` ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/nginx-ingress/README.md new/helm-docs-1.14.2/example-charts/nginx-ingress/README.md --- old/helm-docs-1.13.1/example-charts/nginx-ingress/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/nginx-ingress/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -41,4 +41,4 @@ | controller.service.type | string | `"LoadBalancer"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/nginx-ingress-but-auto-comments/README.md new/helm-docs-1.14.2/example-charts/nginx-ingress-but-auto-comments/README.md --- old/helm-docs-1.13.1/example-charts/nginx-ingress-but-auto-comments/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/nginx-ingress-but-auto-comments/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -41,4 +41,4 @@ | controller.service.type | string | `"LoadBalancer"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/no-requirements/README.md new/helm-docs-1.14.2/example-charts/no-requirements/README.md --- old/helm-docs-1.13.1/example-charts/no-requirements/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/no-requirements/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -26,4 +26,4 @@ | rules.statusCodes.codes.5xx.threshold | float | `1.5` | Threshold percentage of 5xx responses above which the alert will fire | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/no-values/README.md new/helm-docs-1.14.2/example-charts/no-values/README.md --- old/helm-docs-1.13.1/example-charts/no-values/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/no-values/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -17,4 +17,4 @@ * <https://github.com/norwoodj/helm-docs/tree/master/example-charts/no-values> ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/special-characters/README.md new/helm-docs-1.14.2/example-charts/special-characters/README.md --- old/helm-docs-1.13.1/example-charts/special-characters/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/special-characters/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -27,4 +27,4 @@ | htmlSnippets.two | string | `""` | Let's put it in the description <html></html> | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/special-characters-but-auto-comments/README.md new/helm-docs-1.14.2/example-charts/special-characters-but-auto-comments/README.md --- old/helm-docs-1.13.1/example-charts/special-characters-but-auto-comments/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/special-characters-but-auto-comments/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -27,4 +27,4 @@ | htmlSnippets.two | string | `""` | Let's put it in the description <html></html> | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/umbrella/README.md new/helm-docs-1.14.2/example-charts/umbrella/README.md --- old/helm-docs-1.13.1/example-charts/umbrella/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/umbrella/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -25,4 +25,4 @@ | sub-b.mySubKeyB | string | `"my-sub-value-b"` | Value for sub-chart B | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-a/README.md new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-a/README.md --- old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-a/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-a/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -19,4 +19,4 @@ | mySubKeyA | string | `"my-sub-value-a"` | Value for sub-chart A | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-b/README.md new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-b/README.md --- old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-b/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-b/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -18,4 +18,4 @@ | mySubKeyB | string | `"my-sub-value-b"` | Value for sub-chart B | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-c/README.md new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-c/README.md --- old/helm-docs-1.13.1/example-charts/umbrella/charts/sub-c/README.md 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/umbrella/charts/sub-c/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -17,4 +17,4 @@ | global | object | `{}` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/use-yaml-file/Chart.yaml new/helm-docs-1.14.2/example-charts/use-yaml-file/Chart.yaml --- old/helm-docs-1.13.1/example-charts/use-yaml-file/Chart.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/use-yaml-file/Chart.yaml 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,10 @@ +apiVersion: v1 +name: no-values +description: A very simple chart that doesn't even need any values for customization +version: "0.2.0" +home: "https://github.com/norwoodj/helm-docs/tree/master/example-charts/no-values" +sources: ["https://github.com/norwoodj/helm-docs/tree/master/example-charts/no-values"] +engine: gotpl +maintainers: + - email: norwood.john.m(a)gmail.com + name: John Norwood diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/use-yaml-file/README.md new/helm-docs-1.14.2/example-charts/use-yaml-file/README.md --- old/helm-docs-1.13.1/example-charts/use-yaml-file/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/use-yaml-file/README.md 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,48 @@ +# no-values + +A very simple chart that doesn't even need any values for customization + +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) + +## Additional Information + +### Snapshot classes + +| name | resource group | incremental | +|----------|----------------|-------------| +| azure-incr | true | | +| azure | false | | +| local-incr | true | | +| local | false | | +| mask-data-incr | true | rg-mask-data | +| mask-data | false | rg-mask-data | + +### Default resources + +```yaml +requests: + cpu: 10m + memory: 100m +``` + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm repo add foo-bar http://charts.foo-bar.com +$ helm install my-release foo-bar/no-values +``` + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| resources.requests.cpu | string | `"10m"` | | +| resources.requests.memory | string | `"100m"` | | +| volumeSnapshotClass.azure.parameters | object | `{}` | | +| volumeSnapshotClass.local.parameters | object | `{}` | | +| volumeSnapshotClass.mask-data.parameters.resourceGroup | string | `"rg-mask-data"` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.14.0](https://github.com/norwoodj/helm-docs/releases/v1.14.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/use-yaml-file/README.md.gotmpl new/helm-docs-1.14.2/example-charts/use-yaml-file/README.md.gotmpl --- old/helm-docs-1.13.1/example-charts/use-yaml-file/README.md.gotmpl 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/use-yaml-file/README.md.gotmpl 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,39 @@ +{{ template "chart.header" . }} +{{ template "chart.description" . }} + +{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} + +## Additional Information + +{{ $values := (.Files.Get "values.yaml") | fromYaml }} + +### Snapshot classes + +| name | resource group | incremental | +|----------|----------------|-------------| +{{- range $name, $spec := $values.volumeSnapshotClass }} +{{- range $parameterIncr := list "true" "false" }} +| {{ $name }}{{- if eq $parameterIncr "true" -}}-incr{{- end }} | {{ $parameterIncr }} | {{ $spec.parameters.resourceGroup | default "" }} | +{{- end }} +{{- end }} + +### Default resources + +```yaml +{{ $values.resources | toYaml }} +``` + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm repo add foo-bar http://charts.foo-bar.com +$ helm install my-release foo-bar/{{ template "chart.name" . }} +``` + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} + +{{ template "helm-docs.versionFooter" . }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/example-charts/use-yaml-file/values.yaml new/helm-docs-1.14.2/example-charts/use-yaml-file/values.yaml --- old/helm-docs-1.13.1/example-charts/use-yaml-file/values.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/example-charts/use-yaml-file/values.yaml 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,15 @@ +volumeSnapshotClass: + azure: + parameters: {} + + local: + parameters: {} + + mask-data: + parameters: + resourceGroup: rg-mask-data + +resources: + requests: + cpu: 10m + memory: 100m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/go.mod new/helm-docs-1.14.2/go.mod --- old/helm-docs-1.13.1/go.mod 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/go.mod 2024-07-08 12:13:38.000000000 +0200 @@ -1,43 +1,45 @@ module github.com/norwoodj/helm-docs -go 1.22 +go 1.22.0 + +toolchain go1.22.1 require ( - github.com/Masterminds/sprig/v3 v3.2.2 + github.com/Masterminds/sprig/v3 v3.2.3 github.com/gobwas/glob v0.2.3 - github.com/sirupsen/logrus v1.6.0 - github.com/spf13/cobra v1.7.0 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.16.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/helm v2.14.3+incompatible + helm.sh/helm/v3 v3.15.2 ) require ( github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/google/uuid v1.1.2 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/huandu/xstrings v1.3.1 // indirect - github.com/imdario/mergo v0.3.11 // indirect + github.com/huandu/xstrings v1.4.0 // indirect + github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mitchellh/copystructure v1.0.0 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/mitchellh/reflectwalk v1.0.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/shopspring/decimal v1.2.0 // indirect + github.com/shopspring/decimal v1.3.1 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect - golang.org/x/crypto v0.20.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/go.sum new/helm-docs-1.14.2/go.sum --- old/helm-docs-1.13.1/go.sum 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/go.sum 2024-07-08 12:13:38.000000000 +0200 @@ -40,10 +40,11 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= -github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= +github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= +github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -52,7 +53,7 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -107,8 +108,8 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -124,8 +125,9 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -133,19 +135,19 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= +github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -156,14 +158,17 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -173,17 +178,18 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -199,14 +205,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -217,12 +225,13 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= -golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -256,6 +265,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -288,6 +298,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -307,11 +319,11 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -343,10 +355,16 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -355,6 +373,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -407,6 +426,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -506,11 +526,13 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +helm.sh/helm/v3 v3.15.2 h1:/3XINUFinJOBjQplGnjw92eLGpgXXp1L8chWPkCkDuw= +helm.sh/helm/v3 v3.15.2/go.mod h1:FzSIP8jDQaa6WAVg9F+OkKz7J0ZmAga4MABtTbsb9WQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -518,8 +540,6 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/helm v2.14.3+incompatible h1:uzotTcZXa/b2SWVoUzM1xiCXVjI38TuxMujS/1s+3Gw= -k8s.io/helm v2.14.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/pkg/document/generate.go new/helm-docs-1.14.2/pkg/document/generate.go --- old/helm-docs-1.13.1/pkg/document/generate.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/pkg/document/generate.go 2024-07-08 12:13:38.000000000 +0200 @@ -26,7 +26,7 @@ return f, err } -func PrintDocumentation(chartDocumentationInfo helm.ChartDocumentationInfo, chartSearchRoot string, templateFiles []string, dryRun bool, helmDocsVersion string, badgeStyle string, dependencyValues []DependencyValues) { +func PrintDocumentation(chartDocumentationInfo helm.ChartDocumentationInfo, chartSearchRoot string, templateFiles []string, dryRun bool, helmDocsVersion string, badgeStyle string, dependencyValues []DependencyValues, skipVersionFooter bool) { log.Infof("Generating README Documentation for chart %s", chartDocumentationInfo.ChartDirectory) chartDocumentationTemplate, err := newChartDocumentationTemplate( @@ -41,7 +41,7 @@ return } - chartTemplateDataObject, err := getChartTemplateData(chartDocumentationInfo, helmDocsVersion, dependencyValues) + chartTemplateDataObject, err := getChartTemplateData(chartDocumentationInfo, helmDocsVersion, dependencyValues, skipVersionFooter) if err != nil { log.Warnf("Error generating template data for chart %s: %s", chartDocumentationInfo.ChartDirectory, err) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/pkg/document/model.go new/helm-docs-1.14.2/pkg/document/model.go --- old/helm-docs-1.13.1/pkg/document/model.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/pkg/document/model.go 2024-07-08 12:13:38.000000000 +0200 @@ -29,10 +29,11 @@ type chartTemplateData struct { helm.ChartDocumentationInfo - HelmDocsVersion string - Values []valueRow - Sections sections - Files files + HelmDocsVersion string + Values []valueRow + Sections sections + Files files + SkipVersionFooter bool } type sections struct { @@ -156,7 +157,7 @@ return valueRowsSectionSorted } -func getChartTemplateData(info helm.ChartDocumentationInfo, helmDocsVersion string, dependencyValues []DependencyValues) (chartTemplateData, error) { +func getChartTemplateData(info helm.ChartDocumentationInfo, helmDocsVersion string, dependencyValues []DependencyValues, skipVersionFooter bool) (chartTemplateData, error) { valuesTableRows, err := getUnsortedValueRows(info.ChartValues, info.ChartValuesDescriptions) if err != nil { return chartTemplateData{}, err @@ -213,6 +214,7 @@ Values: valuesTableRows, Sections: valueRowsSectionSorted, Files: files, + SkipVersionFooter: skipVersionFooter, }, nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/pkg/document/template.go new/helm-docs-1.14.2/pkg/document/template.go --- old/helm-docs-1.13.1/pkg/document/template.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/pkg/document/template.go 2024-07-08 12:13:38.000000000 +0200 @@ -10,7 +10,6 @@ "github.com/norwoodj/helm-docs/pkg/util" - "github.com/Masterminds/sprig/v3" log "github.com/sirupsen/logrus" "github.com/norwoodj/helm-docs/pkg/helm" @@ -33,7 +32,9 @@ {{ template "chart.valuesSection" . }} +{{- if not .SkipVersionFooter }} {{ template "helm-docs.versionFooter" . }} +{{- end }} ` func getNameTemplate() string { @@ -427,7 +428,7 @@ func newChartDocumentationTemplate(chartDocumentationInfo helm.ChartDocumentationInfo, chartSearchRoot string, templateFiles []string, badgeStyle string) (*template.Template, error) { documentationTemplate := template.New(chartDocumentationInfo.ChartDirectory) - documentationTemplate.Funcs(sprig.TxtFuncMap()) + documentationTemplate.Funcs(util.FuncMap()) goTemplateList, err := getDocumentationTemplates(chartDocumentationInfo.ChartDirectory, chartSearchRoot, templateFiles, badgeStyle) if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/pkg/util/funcs.go new/helm-docs-1.14.2/pkg/util/funcs.go --- old/helm-docs-1.13.1/pkg/util/funcs.go 1970-01-01 01:00:00.000000000 +0100 +++ new/helm-docs-1.14.2/pkg/util/funcs.go 2024-07-08 12:13:38.000000000 +0200 @@ -0,0 +1,44 @@ +package util + +import ( + "strings" + "text/template" + + "github.com/Masterminds/sprig/v3" + "gopkg.in/yaml.v3" +) + +func FuncMap() template.FuncMap { + f := sprig.TxtFuncMap() + f["toYaml"] = toYAML + f["fromYaml"] = fromYAML + return f +} + +// toYAML takes an interface, marshals it to yaml, and returns a string. It will +// always return a string, even on marshal error (empty string). +// +// This is designed to be called from a template. +func toYAML(v interface{}) string { + data, err := yaml.Marshal(v) + if err != nil { + // Swallow errors inside of a template. + return "" + } + return strings.TrimSuffix(string(data), "\n") +} + +// fromYAML converts a YAML document into a map[string]interface{}. +// +// This is not a general-purpose YAML parser, and will not parse all valid +// YAML documents. Additionally, because its intended use is within templates +// it tolerates errors. It will insert the returned error message string into +// m["Error"] in the returned map. +func fromYAML(str string) map[string]interface{} { + m := map[string]interface{}{} + + if err := yaml.Unmarshal([]byte(str), &m); err != nil { + m["Error"] = err.Error() + } + return m +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/pkg/util/ignore.go new/helm-docs-1.14.2/pkg/util/ignore.go --- old/helm-docs-1.13.1/pkg/util/ignore.go 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/pkg/util/ignore.go 2024-07-08 12:13:38.000000000 +0200 @@ -7,7 +7,7 @@ "path/filepath" log "github.com/sirupsen/logrus" - "k8s.io/helm/pkg/ignore" + "helm.sh/helm/v3/pkg/ignore" ) var defaultIgnore = map[string]bool{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/helm-docs-1.13.1/release.sh new/helm-docs-1.14.2/release.sh --- old/helm-docs-1.13.1/release.sh 2024-03-02 15:12:58.000000000 +0100 +++ new/helm-docs-1.14.2/release.sh 2024-07-08 12:13:38.000000000 +0200 @@ -8,6 +8,11 @@ exit 1 fi + if ! [[ "${release_version}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Release version must be of the form 'v1.2.3'" + exit 1 + fi + git commit -am "Release ${release_version}" --allow-empty git cliff --tag "${release_version}" -o git commit --amend -a ++++++ helm-docs.obsinfo ++++++ --- /var/tmp/diff_new_pack.Y0MoC7/_old 2024-07-11 20:33:46.006152698 +0200 +++ /var/tmp/diff_new_pack.Y0MoC7/_new 2024-07-11 20:33:46.006152698 +0200 @@ -1,5 +1,5 @@ name: helm-docs -version: 1.13.1 -mtime: 1709388778 -commit: a66bb9c69c0bb38ff86ec7dccb1c11e7b70654c0 +version: 1.14.2 +mtime: 1720433618 +commit: 37d3055fece566105cf8cff7c17b7b2355a01677 ++++++ vendor.tar.gz ++++++ ++++ 9784 lines of diff (skipped)

1 0

commit parcellite for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package parcellite for openSUSE:Factory checked in at 2024-07-11 20:33:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parcellite (Old) and /work/SRC/openSUSE:Factory/.parcellite.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parcellite" Thu Jul 11 20:33:03 2024 rev:36 rq:1186770 version:1.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/parcellite/parcellite.changes 2024-07-05 19:57:14.167593123 +0200 +++ /work/SRC/openSUSE:Factory/.parcellite.new.17339/parcellite.changes 2024-07-11 20:33:44.018080819 +0200 @@ -1,0 +2,7 @@ +Thu Jul 11 07:42:54 UTC 2024 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.2.5: + * Updated man page for fifo operation + * Removed autotools. Just use make - see the README + +------------------------------------------------------------------- Old: ---- 1.2.4.tar.gz New: ---- 1.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parcellite.spec ++++++ --- /var/tmp/diff_new_pack.aUbD3A/_old 2024-07-11 20:33:44.942114228 +0200 +++ /var/tmp/diff_new_pack.aUbD3A/_new 2024-07-11 20:33:44.946114372 +0200 @@ -17,7 +17,7 @@ Name: parcellite -Version: 1.2.4 +Version: 1.2.5 Release: 0 Summary: A lightweight GTK+ clipboard manager License: GPL-3.0-or-later @@ -28,7 +28,6 @@ Patch0: parcellite-1.1.7-defaults.patch Patch1: parcellite-1.1.9_no_kde_start.patch Patch2: parcellite-1.2.4.0-simple.patch -BuildRequires: automake BuildRequires: gnome-icon-theme BuildRequires: intltool >= 0.23 BuildRequires: pkgconfig @@ -49,8 +48,6 @@ %autosetup -p1 %build -autoreconf -fi -%configure %make_build sed -i -e '/^Icon/s/=.*/=parcellite/' data/parcellite.desktop ++++++ 1.2.4.tar.gz -> 1.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/ChangeLog new/parcellite-1.2.5/ChangeLog --- old/parcellite-1.2.4/ChangeLog 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/ChangeLog 2024-07-11 05:33:16.000000000 +0200 @@ -1,3 +1,7 @@ +V1.2.5 Wednsday, July 10, 2024 + +Updated man page for fifo operation. + +Removed autotools. Just use make - see the README. + Since 1.2.4.0 is seen as newer than 1.2.4, this will be the new release fixing the segfault. V1.2.4 Tuesday, June 18, 2024 +Fixed Segfault on Rocky 9, and potential on any OS. V1.2.4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/Makefile new/parcellite-1.2.5/Makefile --- old/parcellite-1.2.4/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/parcellite-1.2.5/Makefile 2024-07-11 05:33:16.000000000 +0200 @@ -0,0 +1,79 @@ +# Copyright (C) 2010-2024 Doug Springer <gpib(a)rickyrockrat.net> +# +# This file is part of Parcellite. +# +# Parcellite is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Parcellite is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +prefix?=/usr +DESTDIR?= +sysconfdir = $(DESTDIR)/etc +INSTDIR:=$(DESTDIR)$(prefix) +# Attempt to help intltool on some systems (not needed on Alpine). +top_builddir:=$(CURDIR) +export top_builddir + + +GETTEXT_PACKAGE:=parcellite + +DIRS:= data po src doc + +all: src/$(GETTEXT_PACKAGE) +BUILDCONFIG=yes +PRFX=. +export PRFX +include simple.common + +GIT_PVERSION:=$(shell git log -n1 --pretty=format:%h) +VERSION?=git-$(GIT_PVERSION) + + + + +makeopts=-f Makefile GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) BUILDCONFIG='' + +config.h: + @echo "#define ENABLE_NLS 1" > $@ + @echo '#define GETTEXT_PACKAGE "parcellite"' >> $@ + @echo '#define VERSION "$(VERSION)"' >> $@ + + +build.po build.data: config.h + $(MAKE) -C $$(echo $@|sed 's!build.!!') $(makeopts) + +src/$(GETTEXT_PACKAGE): check_dep build.po build.data + $(MAKE) -C src $(makeopts) $(GETTEXT_PACKAGE) + +install-bin: src/$(GETTEXT_PACKAGE) build.data + $(MAKE) -C data $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install + $(MAKE) -C src $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install + +install-lang: build.po + $(MAKE) -C po $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install + +install-doc: + $(MAKE) -C doc $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install + mkdir -p $(INSTDIR)/share/doc/$(GETTEXT_PACKAGE) + install -c -m 644 COPYING ChangeLog README $(INSTDIR)/share/doc/$(GETTEXT_PACKAGE) + +install: src/$(GETTEXT_PACKAGE) build.po build.data + for d in $(DIRS); do \ + $(MAKE) -C $$d $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) $@; \ + done + +clean: + -for d in $(DIRS); do \ + $(MAKE) -C $$d $(makeopts) $@ ; \ + done + -rm config.h build.po build.data src/config.simple.h + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/Makefile.am new/parcellite-1.2.5/Makefile.am --- old/parcellite-1.2.4/Makefile.am 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS = gnu - -SUBDIRS = doc po data src - -DISTCLEANFILES = *.bak *.log *~ - -EXTRA_DIST = \ - m4 \ - autogen.sh \ - config.rpath \ - m4/ChangeLog \ - $(desktop_DATA) \ - $(autostart_DATA) \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in - -ACLOCAL_AMFLAGS = -I m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/Makefile.simple new/parcellite-1.2.5/Makefile.simple --- old/parcellite-1.2.4/Makefile.simple 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/Makefile.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -# Copyright (C) 2010-2024 Doug Springer <gpib(a)rickyrockrat.net> -# -# This file is part of Parcellite. -# -# Parcellite is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Parcellite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -prefix?=/usr -DESTDIR?= -sysconfdir = $(DESTDIR)/etc -INSTDIR:=$(DESTDIR)$(prefix) -# Attempt to help intltool on some systems (not needed on Alpine). -top_builddir:=$(CURDIR) -export top_builddir - - -GETTEXT_PACKAGE:=parcellite - -DIRS:= data po src doc - -all: src/$(GETTEXT_PACKAGE) -BUILDCONFIG=yes -PRFX=. -export PRFX -include simple.common - -GIT_PVERSION:=$(shell git log -n1 --pretty=format:%h) -VERSION?=git-$(GIT_PVERSION) - - - - -makeopts=-f Makefile.simple GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) BUILDCONFIG='' - -config.h: - @echo "#define ENABLE_NLS 1" > $@ - @echo '#define GETTEXT_PACKAGE "parcellite"' >> $@ - @echo '#define VERSION "$(VERSION)"' >> $@ - - -build.po build.data: config.h - $(MAKE) -C $$(echo $@|sed 's!build.!!') $(makeopts) - -src/$(GETTEXT_PACKAGE): check_dep build.po build.data - $(MAKE) -C src $(makeopts) $(GETTEXT_PACKAGE) - -install-bin: src/$(GETTEXT_PACKAGE) build.data - $(MAKE) -C data $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install - $(MAKE) -C src $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install - -install-lang: build.po - $(MAKE) -C po $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install - -install-doc: - $(MAKE) -C doc $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) install - mkdir -p $(INSTDIR)/share/doc/$(GETTEXT_PACKAGE) - install -c -m 644 COPYING ChangeLog README $(INSTDIR)/share/doc/$(GETTEXT_PACKAGE) - -install: src/$(GETTEXT_PACKAGE) build.po build.data - for d in $(DIRS); do \ - $(MAKE) -C $$d $(makeopts) sysconfdir=$(sysconfdir) INSTDIR=$(INSTDIR) GETTEXT_PACKAGE=$(GETTEXT_PACKAGE) $@; \ - done - -clean: - -for d in $(DIRS); do \ - $(MAKE) -C $$d $(makeopts) $@ ; \ - done - -rm config.h build.po build.data src/config.simple.h - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/README new/parcellite-1.2.5/README --- old/parcellite-1.2.4/README 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/README 2024-07-11 05:33:16.000000000 +0200 @@ -15,7 +15,7 @@ Project website: http://parcellite.sourceforge.net/ or https://github.com/rickyrockrat/parcellite -Release 1.2.4.0 for addition to Alpine Linux. See the Changelog. +Release 1.2.5 for addition to Alpine Linux. See the Changelog. How to compile and install parcellite @@ -31,14 +31,11 @@ $ cd parcellite-x.y.z No Autotools (just make and install it): Assuming you are on tag 1.2.3: - $ make -f Makefile.simple VERSION=1.2.3 - $ sudo make -f Makefile.simple install prefix=/usr/local - $ OR make -f Makefile.simple install DESTDIR=/tmp/myinstall prefix=/usr/local + $ make VERSION=1.2.3 + $ sudo make install prefix=/usr/local + $ OR make install DESTDIR=/tmp/myinstall prefix=/usr/local -if you want autotools: - $ ./autogen.sh # See note below on OpenBSD - $ ./configure $ make $ sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/autogen.sh new/parcellite-1.2.5/autogen.sh --- old/parcellite-1.2.4/autogen.sh 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -#!/bin/sh - -echo "gettextize..." - -GETTEXTIZE="gettextize" -($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1 || { - echo "gettextize not found" - exit 1 -} - -if test "$GETTEXTIZE"; then - echo "Creating $dr/aclocal.m4 ..." - test -r aclocal.m4 || touch aclocal.m4 - echo "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy - echo "Making aclocal.m4 writable ..." - test -r aclocal.m4 && chmod u+w aclocal.m4 -fi - -echo "intltoolize..." -(intltoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "intltoolize not found" - exit 1 -} - -intltoolize --copy --force --automake - -echo "aclocal..." -(aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo "aclocal not found" - exit 1 -} - -aclocal -I m4 - -echo "autoheader..." -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo "autoheader not found" - exit 1 -} - -autoheader - -echo "automake..." -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo "automake not found" - exit 1 -} - -automake --add-missing --copy --gnu - -echo "autoconf..." -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo "autoconf not found" - exit 1 -} - -autoconf - -echo "now run configure" - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/configure.ac new/parcellite-1.2.5/configure.ac --- old/parcellite-1.2.4/configure.ac 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +0,0 @@ -# ------------------------------------------------------------------------------- -# Autoconf/automake. -# ------------------------------------------------------------------------------- -AC_PREREQ([2.5]) -AC_INIT([parcellite], m4_esyscmd([./scmversion.sh | tr -d '\n']), [gpib(a)rickyrockrat.net] -# AC_INIT([parcellite], [lollygag], [gpib(a)rickyrockrat.com] -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) - -AC_CONFIG_MACRO_DIR([m4]) - -AC_CONFIG_SRCDIR([src/main.c]) -AM_CONFIG_HEADER([config.h]) - -# ------------------------------------------------------------------------------- -# Gettext. -# ------------------------------------------------------------------------------- - -GETTEXT_PACKAGE=parcellite -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) - -ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN" -AM_GLIB_GNU_GETTEXT() -AC_PROG_INTLTOOL([0.23]) - -parcellitelocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(parcellitelocaledir) - -AM_GNU_GETTEXT([external]) - -# ------------------------------------------------------------------------------- -# Main settings. -# ------------------------------------------------------------------------------- -# prefix=/usr - -# ------------------------------------------------------------------------------- -# Checks for programs. -# ------------------------------------------------------------------------------- -AC_PROG_CC() -AC_PROG_INSTALL() -AC_PROG_MAKE_SET() -AC_CHECK_FUNCS([memset]) -PKG_PROG_PKG_CONFIG(0.20) - -# ------------------------------------------------------------------------------- -# Application indicator. -# ------------------------------------------------------------------------------- - -APPINDICATOR_REQUIRED_VERSION=0.2.4 -APPIND_LIB=appindicator-0.1 - -AC_ARG_ENABLE([appindicator], - AS_HELP_STRING([--enable-appindicator[=@<:@no/yes@:>@]],[Build support for application indicators]), - [enable_appindicator=$enableval], - [enable_appindicator="yes"]) - -have_appindicator=no -if test "x$enable_appindicator" = "xyes" ; then -# PKG_CHECK_MODULES completly broken on my system. - echo -n "checking for $APPIND_LIB... " - if `$PKG_CONFIG --exists $APPIND_LIB` ; then - if `$PKG_CONFIG --atleast-version=$APPINDICATOR_REQUIRED_VERSION $APPIND_LIB` ; then - have_appindicator=yes - PKG_CHECK_MODULES([APPINDICATOR], [$APPIND_LIB]) - echo "yes" - else - echo "no" - fi - else - echo "no" - fi -# PKG_CHECK_MODULES(APPINDICATOR,[appindicator-0.1>=9.9.9],[have_appindicator=yes],[have_appindicator=no]) -fi -#echo "have_appindicator=$have_appindicator" -#echo "pkgcfg=$PKG_CONFIG" -AM_CONDITIONAL(HAVE_APPINDICATOR, test x$enable_appindicator = xyes) - -if test "x$have_appindicator" = "xyes" ; then - AC_DEFINE(HAVE_APPINDICATOR, 1, [ Have appindicator]) - AC_SUBST(APPINDICATOR_CFLAGS) - AC_SUBST(APPINDICATOR_LIBS) -fi - -AC_SUBST(X11_LIBS, -lX11) - -# ------------------------------------------------------------------------------- -# Checks for libraries. -# ------------------------------------------------------------------------------- -# AC_CHECK_LIB(pthread, pthread_create) -pkg_modules="gtk+-2.0 >= 2.10.0" -PKG_CHECK_MODULES([GTK], [$pkg_modules]) -#keep pkg-config from being called -GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0|sed 's/.* $-lgtk-[[^ ]]*$ .*/\1/'` -gtk_libs=`echo "$GTK_LIBS"|sed 's/-l//'` -#gtk_libs=`$PKG_CONFIG --libs gtk+-2.0|sed 's/.* -l$gtk-[[^ ]]*$ .*/\1/'` -#echo "gtk_libs = '$gtk_libs'" -AC_CHECK_LIB([$gtk_libs],gtk_status_icon_new,[],AC_MSG_ERROR(Requirement not met: gtk >= 2.10.0)) -#AM_PATH_GTK_2_0(2.10.0, [], AC_MSG_ERROR(Requirement not met: gtk >= 2.10.0)) -#AM_PATH_GLIB_2_0(2.14.0, [], AC_MSG_ERROR(Requirement not met: glib >= 2.14.0)) - - -#GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` -#GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs|sed 's!.*$-lgtk-[^ ]*$ .*!\1!'` -# ------------------------------------------------------------------------------- -# Checks for header files. -# ------------------------------------------------------------------------------- -AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h]) - -# ------------------------------------------------------------------------------- -# Checks for typedefs, structures, and compiler characteristics. -# ------------------------------------------------------------------------------- -AC_C_CONST() -AC_C_INLINE() -AC_TYPE_SIZE_T() -AC_PATH_X() - -# ------------------------------------------------------------------------------- -# Checks for library functions. -# ------------------------------------------------------------------------------- -AC_TYPE_SIGNAL() - -AC_CONFIG_FILES([Makefile - doc/Makefile - src/Makefile - data/Makefile]) - -AC_OUTPUT([po/Makefile.in]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/data/Makefile new/parcellite-1.2.5/data/Makefile --- old/parcellite-1.2.4/data/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/parcellite-1.2.5/data/Makefile 2024-07-11 05:33:16.000000000 +0200 @@ -0,0 +1,63 @@ +# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> +# +# This file is part of Parcellite. +# +# Parcellite is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Parcellite is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +DATADIR:=$(INSTDIR)/share + +desktopdir = $(DATADIR)/applications +pixmapdir = $(DATADIR)/pixmaps +autostartdir = $(sysconfdir)/xdg/autostart +top_srcdir = .. + +srcdir:=. + +# po dir +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +GMSGFMT = /usr/bin/msgfmt +MSGFMT = /usr/bin/msgfmt +XGETTEXT = /usr/bin/xgettext +INTLTOOL_UPDATE = /usr/bin/intltool-update +INTLTOOL_EXTRACT = /usr/bin/intltool-extract +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +INTLTOOL_MERGE = /usr/bin/intltool-merge + + +# installable items +ICONS:= $(GETTEXT_PACKAGE).png $(GETTEXT_PACKAGE).svg $(GETTEXT_PACKAGE).xpm +DESK:= $(GETTEXT_PACKAGE).desktop $(GETTEXT_PACKAGE)-startup.desktop + +all: $(GETTEXT_PACKAGE).desktop $(GETTEXT_PACKAGE).png + + +%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) + LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ + + +install: $(ICONS) $(DESK) + mkdir -p $(autostartdir) $(desktopdir) + @echo "Installing $(GETTEXT_PACKAGE).desktop to $(desktopdir)" + $(INSTALL_DATA) $(GETTEXT_PACKAGE).desktop $(desktopdir) + @echo "Installing $(GETTEXT_PACKAGE)-startup.desktop to $(autostartdir)" + $(INSTALL_DATA) $(GETTEXT_PACKAGE)-startup.desktop $(autostartdir) + mkdir -p $(pixmapdir) + for i in $(ICONS); do echo "Installing $$i to $(pixmapdir)"; \ + $(INSTALL_DATA) $$i $(pixmapdir); \ + done + +clean: + -rm *.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/data/Makefile.am new/parcellite-1.2.5/data/Makefile.am --- old/parcellite-1.2.4/data/Makefile.am 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -## Process this file with automake to produce Makefile.in -## -## Copyright (C) 2010 Doug Springer (gpib at rickyrockrat dot net) -## -## This file is part of parcellite. -## Parcellite is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or -## (at your option) any later version. -## -## Parcellite is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see <http://www.gnu.org/licenses/>. - -@INTLTOOL_DESKTOP_RULE@ - -xdgdatadir=@XDGDATADIR@ -app_name=parcellite - -app_icon_files = \ - $(app_name:%=%.png) \ - $(app_name:%=%.svg) \ - $(app_name:%=%.xpm) - -desktopdir = $(datadir)/applications -desktop_in_file = $(app_name:%=%.desktop.in) -desktop_DATA = $(app_name:%=%.desktop) - -autostartdir = $(sysconfdir)/xdg/autostart -autostart_in_file = $(app_name:%=%-startup.desktop.in) -autostart_DATA = $(app_name:%=%-startup.desktop) - -pixmapdir = $(datadir)/pixmaps - -pixmap_DATA = $(app_icon_files) - - -EXTRA_DIST = \ - $(desktop_in_file) \ - $(autostart_in_file) \ - $(app_icon_files) - -CLEANFILES = \ - $(desktop_DATA) \ - $(autostart_DATA) - -DISTCLEANFILES = \ - $(desktop_DATA) \ - $(autostart_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/data/Makefile.simple new/parcellite-1.2.5/data/Makefile.simple --- old/parcellite-1.2.4/data/Makefile.simple 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/data/Makefile.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> -# -# This file is part of Parcellite. -# -# Parcellite is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Parcellite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -DATADIR:=$(INSTDIR)/share - -desktopdir = $(DATADIR)/applications -pixmapdir = $(DATADIR)/pixmaps -autostartdir = $(sysconfdir)/xdg/autostart -top_srcdir = .. - -srcdir:=. - -# po dir -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -GMSGFMT = /usr/bin/msgfmt -MSGFMT = /usr/bin/msgfmt -XGETTEXT = /usr/bin/xgettext -INTLTOOL_UPDATE = /usr/bin/intltool-update -INTLTOOL_EXTRACT = /usr/bin/intltool-extract -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -INTLTOOL_MERGE = /usr/bin/intltool-merge - - -# installable items -ICONS:= $(GETTEXT_PACKAGE).png $(GETTEXT_PACKAGE).svg $(GETTEXT_PACKAGE).xpm -DESK:= $(GETTEXT_PACKAGE).desktop $(GETTEXT_PACKAGE)-startup.desktop - -all: $(GETTEXT_PACKAGE).desktop $(GETTEXT_PACKAGE).png - - -%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) - LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ - - -install: $(ICONS) $(DESK) - mkdir -p $(autostartdir) $(desktopdir) - @echo "Installing $(GETTEXT_PACKAGE).desktop to $(desktopdir)" - $(INSTALL_DATA) $(GETTEXT_PACKAGE).desktop $(desktopdir) - @echo "Installing $(GETTEXT_PACKAGE)-startup.desktop to $(autostartdir)" - $(INSTALL_DATA) $(GETTEXT_PACKAGE)-startup.desktop $(autostartdir) - mkdir -p $(pixmapdir) - for i in $(ICONS); do echo "Installing $$i to $(pixmapdir)"; \ - $(INSTALL_DATA) $$i $(pixmapdir); \ - done - -clean: - -rm *.desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/doc/Makefile new/parcellite-1.2.5/doc/Makefile --- old/parcellite-1.2.4/doc/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/parcellite-1.2.5/doc/Makefile 2024-07-11 05:33:16.000000000 +0200 @@ -0,0 +1,40 @@ +# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> +# +# This file is part of Parcellite. +# +# Parcellite is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Parcellite is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +MANDIR:=$(INSTDIR)/share/man/man1 + +top_srcdir = .. + +srcdir:=. + +# po dir +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +GMSGFMT = /usr/bin/msgfmt +MSGFMT = /usr/bin/msgfmt +XGETTEXT = /usr/bin/xgettext + +all: + + +install: $(GETTEXT_PACKAGE).1 + mkdir -p $(MANDIR) + gzip -c $^ > $(MANDIR)/$(GETTEXT_PACKAGE).gz + + +clean: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/doc/Makefile.am new/parcellite-1.2.5/doc/Makefile.am --- old/parcellite-1.2.4/doc/Makefile.am 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -man_MANS = parcellite.1 -EXTRA_DIST = $(man_MANS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/doc/Makefile.simple new/parcellite-1.2.5/doc/Makefile.simple --- old/parcellite-1.2.4/doc/Makefile.simple 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/doc/Makefile.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> -# -# This file is part of Parcellite. -# -# Parcellite is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Parcellite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -MANDIR:=$(INSTDIR)/share/man/man1 - -top_srcdir = .. - -srcdir:=. - -# po dir -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -GMSGFMT = /usr/bin/msgfmt -MSGFMT = /usr/bin/msgfmt -XGETTEXT = /usr/bin/xgettext - -all: - - -install: $(GETTEXT_PACKAGE).1 - mkdir -p $(MANDIR) - gzip -c $^ > $(MANDIR)/$(GETTEXT_PACKAGE).gz - - -clean: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/doc/parcellite.1 new/parcellite-1.2.5/doc/parcellite.1 --- old/parcellite-1.2.4/doc/parcellite.1 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/doc/parcellite.1 2024-07-11 05:33:16.000000000 +0200 @@ -111,6 +111,34 @@ If you hold Shift while holding down right-click (this is like a right-drag), then it toggles each item as it enters the item. .TP To complete the delete, hit enter. +.SH Command FIFO +There are some experimental commands to control the clipboard via the fifo in: + $USER/.local/share/parcellite/fifo_cmd +.SH Commands for the FIFO +.B stop_pri + Stop capturing the 'Primary' Clipboard + +.B stop_cli + Stop capturing the 'Clipboard' Clipboard + +.B stop_all + Stop capturing both clipboards + +.B run_pri + Start capturing the 'Primary' Clipboard + +.B run_cli + Start capturing the 'Clipboard' Clipboard + +.B run_all + Start capturing both clipboards + +.B clear_all + Clear all items in your normal history. + +.B Example: + echo 'clear_all' > ~/.local/share/parcellite/fifo_cmd + .SH SEE ALSO .PP Website: http://parcellite.sourceforge.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/po/Makefile new/parcellite-1.2.5/po/Makefile --- old/parcellite-1.2.4/po/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/parcellite-1.2.5/po/Makefile 2024-07-11 05:33:16.000000000 +0200 @@ -0,0 +1,97 @@ +# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> +# +# This file is part of Parcellite. +# +# Parcellite is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Parcellite is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +localedir = $(INSTDIR)/share/locale + +srcdir:=. + +# po dir +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +GMSGFMT = /usr/bin/msgfmt +MSGFMT = /usr/bin/msgfmt +XGETTEXT = /usr/bin/xgettext +INTLTOOL_UPDATE = /usr/bin/intltool-update +INTLTOOL_EXTRACT = /usr/bin/intltool-extract +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +POFILES=$(shell ls *.po) +USE_LINGUAS:=$(shell ls *.po|sed 's!.po!!g'|tr '\n' ' ') +CATALOGS:=$(shell ls *.po|sed 's!.po!.gmo!g') + +DISTFILES = $(POFILES) +EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars + +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +POTFILES = \ + ../src/main.c \ + ../src/utils.c \ + ../src/preferences.c \ + ../data/parcellite.desktop.in \ + ../data/parcellite-startup.desktop.in + +#CATALOGS:=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + +all: $(CATALOGS) + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + +.po.cat: + sed -f ..:wq/intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && gencat $@ $*.msg + +$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + +install: all + @echo "langs $(USE_LINGUAS)" + for lang in $(USE_LINGUAS); do \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + mkdir -p $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + fi; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $(srcdir)/$$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + fi; \ + fi; \ + done + +clean: + -rm *.pox *.gmo *.msg *.mo *.cat + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/po/Makefile.in.in new/parcellite-1.2.5/po/Makefile.in.in --- old/parcellite-1.2.4/po/Makefile.in.in 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/po/Makefile.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,217 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper(a)gnu.ai.mit.edu> -# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns(a)gmail.com> -# -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. -# -# - Modified by Owen Taylor <otaylor(a)redhat.com> to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman <jacob(a)ximian.com> to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes <dobey.pwns(a)gmail.com> for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/po/Makefile.simple new/parcellite-1.2.5/po/Makefile.simple --- old/parcellite-1.2.4/po/Makefile.simple 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/po/Makefile.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -# Copyright (C) 2010-2022 Doug Springer <gpib(a)rickyrockrat.net> -# -# This file is part of Parcellite. -# -# Parcellite is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Parcellite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -localedir = $(INSTDIR)/share/locale - -srcdir:=. - -# po dir -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -GMSGFMT = /usr/bin/msgfmt -MSGFMT = /usr/bin/msgfmt -XGETTEXT = /usr/bin/xgettext -INTLTOOL_UPDATE = /usr/bin/intltool-update -INTLTOOL_EXTRACT = /usr/bin/intltool-extract -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -POFILES=$(shell ls *.po) -USE_LINGUAS:=$(shell ls *.po|sed 's!.po!!g'|tr '\n' ' ') -CATALOGS:=$(shell ls *.po|sed 's!.po!.gmo!g') - -DISTFILES = $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars - -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -POTFILES = \ - ../src/main.c \ - ../src/utils.c \ - ../src/preferences.c \ - ../data/parcellite.desktop.in \ - ../data/parcellite-startup.desktop.in - -#CATALOGS:=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -all: $(CATALOGS) - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ..:wq/intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: all - @echo "langs $(USE_LINGUAS)" - for lang in $(USE_LINGUAS); do \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - mkdir -p $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - fi; \ - fi; \ - done - -clean: - -rm *.pox *.gmo *.msg *.mo *.cat - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/rpm/parcellite.spec new/parcellite-1.2.5/rpm/parcellite.spec --- old/parcellite-1.2.4/rpm/parcellite.spec 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/rpm/parcellite.spec 2024-07-11 05:33:16.000000000 +0200 @@ -1,12 +1,13 @@ Name: parcellite -Version: 1.2.3 +Version: 1.2.5 Release: 1%{?prerelease:.%{?prerelease}}%{?dist} Summary: A lightweight GTK+ clipboard manager Group: User Interface/Desktops License: GPLv3+ URL: http://parcellite.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: https://github.com/rickyrockrat/%{name}/archive/refs/tags/%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Submitted upstream via # https://sourceforge.net/p/parcellite/patches/29/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,12 +28,12 @@ %setup -q %build -make -f Makefile.simple %{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf %{buildroot} -make -f Makefile.simple install DESTDIR=%{buildroot} INSTALL='install -p' +make install DESTDIR=%{buildroot} INSTALL='install -p' %find_lang %{name} desktop-file-install --vendor="fedora" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/src/Makefile new/parcellite-1.2.5/src/Makefile --- old/parcellite-1.2.4/src/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/parcellite-1.2.5/src/Makefile 2024-07-11 05:33:16.000000000 +0200 @@ -0,0 +1,44 @@ +# Copyright (C) 2007-2022 Doug Springer <gpib(a)rickyrockrat.net> +# +# This file is part of Parcellite. +# +# Parcellite is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Parcellite is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +PRFX=.. +BUILDCONFIG= +export PRFX BUILDCONFIG +include ../simple.common + +CFILES=attr_list.c daemon.c eggaccelerators.c history.c keybinder.c main.c preferences.c utils.c + +OBJS=$(patsubst %.c,%.o,$(CFILES)) +GTKC=$(shell pkg-config --cflags gtk+-2.0) +FONTC=$(shell pkg-config --cflags fontconfig) +FREEC=$(shell pkg-config --cflags freetype2) +LIBAPP=$(shell $(PRFX)/appsuck.sh cflags) + + +CFLAGS=$(GTKC) $(FONTC) $(FREEC) -DHAVE_CONFIG_H -DGETTEXT_PACKAGE='"parcellite"' -DENABLE_NLS=1 -I. -I.. -DPARCELLITELOCALEDIR=\""/usr/share/locale"\" -Wno-deprecated -Wno-deprecated-declarations + +$(GETTEXT_PACKAGE): check_dep $(OBJS) + gcc -Wall $(OBJS) -o $@ $(LIBS) + +%.:%.c + gcc -Wall $CFLAGS $< -o $@ + +install: $(GETTEXT_PACKAGE) + mkdir -p $(INSTDIR)/bin + cp $(GETTEXT_PACKAGE) $(INSTDIR)/bin + +clean: + rm $(OBJS) $(GETTEXT_PACKAGE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/src/Makefile.am new/parcellite-1.2.5/src/Makefile.am --- old/parcellite-1.2.4/src/Makefile.am 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -CFLAGS=-MD -AM_CFLAGS = -I$(top_srcdir) -DPARCELLITELOCALEDIR=\""$(parcellitelocaledir)"\" -INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) -lX11 -lgdk-x11-2.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 - -bin_PROGRAMS = parcellite - -DISTCLEANFILES = *.bak *.log *~ .deps/*.P - -OBJS = *.o - -parcellite_SOURCES = main.c main.h \ - utils.c utils.h \ - parcellite-i18n.h\ - daemon.c daemon.h \ - history.c history.h \ - keybinder.c keybinder.h \ - preferences.c preferences.h \ - eggaccelerators.c eggaccelerators.h \ - attr_list.c attr_list.h - -$(top_srcdir)/config.h: $(parcellite_SOURCES) - GO=$$(grep -c svnversion $(top_srcdir)/configure.ac); if [ "0" != "$$GO" ]; then \ - VER=$$($(top_srcdir)/svnversion.sh); sed -i "s#$.*$svn.*\".*#\1$$VER\"#" $(top_srcdir)/config.h; fi - -# Pull-in dependencies generated with -MD --include $(OBJS:.o=.d) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parcellite-1.2.4/src/Makefile.simple new/parcellite-1.2.5/src/Makefile.simple --- old/parcellite-1.2.4/src/Makefile.simple 2024-06-18 07:26:51.000000000 +0200 +++ new/parcellite-1.2.5/src/Makefile.simple 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# Copyright (C) 2007-2022 Doug Springer <gpib(a)rickyrockrat.net> -# -# This file is part of Parcellite. -# -# Parcellite is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Parcellite is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -PRFX=.. -BUILDCONFIG= -export PRFX BUILDCONFIG -include ../simple.common - -CFILES=attr_list.c daemon.c eggaccelerators.c history.c keybinder.c main.c preferences.c utils.c - -OBJS=$(patsubst %.c,%.o,$(CFILES)) -GTKC=$(shell pkg-config --cflags gtk+-2.0) -FONTC=$(shell pkg-config --cflags fontconfig) -FREEC=$(shell pkg-config --cflags freetype2) -LIBAPP=$(shell $(PRFX)/appsuck.sh cflags) - - -CFLAGS=$(GTKC) $(FONTC) $(FREEC) -DHAVE_CONFIG_H -DGETTEXT_PACKAGE='"parcellite"' -DENABLE_NLS=1 -I. -I.. -DPARCELLITELOCALEDIR=\""/usr/share/locale"\" -Wno-deprecated -Wno-deprecated-declarations - -$(GETTEXT_PACKAGE): check_dep $(OBJS) - gcc -Wall $(OBJS) -o $@ $(LIBS) - -%.:%.c - gcc -Wall $CFLAGS $< -o $@ - -install: $(GETTEXT_PACKAGE) - mkdir -p $(INSTDIR)/bin - cp $(GETTEXT_PACKAGE) $(INSTDIR)/bin - -clean: - rm $(OBJS) $(GETTEXT_PACKAGE)

1 0

commit Komikku for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Komikku for openSUSE:Factory checked in at 2024-07-11 20:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Komikku (Old) and /work/SRC/openSUSE:Factory/.Komikku.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Komikku" Thu Jul 11 20:33:02 2024 rev:16 rq:1186765 version:1.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Komikku/Komikku.changes 2024-07-04 16:25:32.328472529 +0200 +++ /work/SRC/openSUSE:Factory/.Komikku.new.17339/Komikku.changes 2024-07-11 20:33:43.054045964 +0200 @@ -1,0 +2,9 @@ +Wed Jul 10 22:34:25 UTC 2024 - Richard Rahl <rrahl0(a)opensuse.org> + +- update to 1.51.0: + * [Servers] Read Comic Online (EN): Update + * [Servers] Senpai Ediciones (ES): Update + * [Servers] SushiScan (FR): Update + * [L10n] Added Croatian translation + +------------------------------------------------------------------- Old: ---- Komikku-1.50.0.tar.gz New: ---- Komikku-1.51.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Komikku.spec ++++++ --- /var/tmp/diff_new_pack.v93HvQ/_old 2024-07-11 20:33:43.618066356 +0200 +++ /var/tmp/diff_new_pack.v93HvQ/_new 2024-07-11 20:33:43.618066356 +0200 @@ -17,7 +17,7 @@ Name: Komikku -Version: 1.50.0 +Version: 1.51.0 Release: 0 Summary: A manga reader for GNOME License: GPL-3.0-or-later ++++++ Komikku-1.50.0.tar.gz -> Komikku-1.51.0.tar.gz ++++++ ++++ 2316 lines of diff (skipped)

1 0

commit dpic for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpic for openSUSE:Factory checked in at 2024-07-11 20:33:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpic (Old) and /work/SRC/openSUSE:Factory/.dpic.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dpic" Thu Jul 11 20:33:01 2024 rev:27 rq:1186759 version:2024.01.01 Changes: -------- --- /work/SRC/openSUSE:Factory/dpic/dpic.changes 2023-09-06 18:57:56.155008241 +0200 +++ /work/SRC/openSUSE:Factory/.dpic.new.17339/dpic.changes 2024-07-11 20:33:42.118012120 +0200 @@ -1,0 +2,7 @@ +Tue Jul 9 12:59:04 UTC 2024 - Dirk Müller <dmueller(a)suse.com> + +- update to 2024.01.01: + * SVG stroke fix. + * Robust arrowheads and pgf text offsets. + +------------------------------------------------------------------- Old: ---- dpic-2023.02.01.tar.gz New: ---- dpic-2024.01.01.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpic.spec ++++++ --- /var/tmp/diff_new_pack.iR9Vx4/_old 2024-07-11 20:33:42.702033236 +0200 +++ /var/tmp/diff_new_pack.iR9Vx4/_new 2024-07-11 20:33:42.702033236 +0200 @@ -1,7 +1,7 @@ # # spec file for package dpic # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dpic -Version: 2023.02.01 +Version: 2024.01.01 Release: 0 Summary: Pic language processor License: BSD-2-Clause AND CC-BY-3.0 ++++++ dpic-2023.02.01.tar.gz -> dpic-2024.01.01.tar.gz ++++++ ++++ 8755 lines of diff (skipped)

1 0