Some additional PGPLOT functions + Python2/3 supported in setup.py

.github/workflows/build_wheels.yml

@@ -0,0 +1,94 @@
+name: Build Wheels
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - fix-*
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]  # add windows-latest later
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Dependencies are now handled by cibuildwheel's before-all hooks
+      # No need to install them on the runner
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install cibuildwheel
+
+      - name: Build wheels
+        run: cibuildwheel --output-dir dist
+        env:
+          # Install system dependencies and build giza from source
+          # giza-devel is not available in AlmaLinux 8 EPEL, so we build from source
+          # Install build dependencies for RHEL/CentOS/AlmaLinux
+          # Fallback for Debian/Ubuntu systems
+          # Download and build giza from source
+          CIBW_BEFORE_ALL_LINUX: |
+            (which apt || which yum || which dnf) &&
+            ((yum install -y gcc make cairo-devel libX11-devel pkgconfig wget tar gzip) ||
+             (apt-get update && apt-get install -y gcc make libcairo2-dev libx11-dev pkg-config wget tar gzip)) &&
+            cd /tmp &&
+            wget https://github.com/danieljprice/giza/archive/refs/tags/v1.4.2.tar.gz &&
+            tar -xzf v1.4.2.tar.gz &&
+            cd giza-1.4.2 &&
+            export CFLAGS=-fPIC &&
+            ./configure --prefix=/usr/local &&
+            make &&
+            make install &&
+            ldconfig
+          CIBW_BEFORE_ALL_MACOS: "brew install giza libx11 pkg-config"
+          CIBW_BEFORE_ALL_WINDOWS: "echo 'Windows support not implemented yet'"
+          # Ensure pkg-config and runtime linker can find giza
+          CIBW_ENVIRONMENT_LINUX: "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH"
+          CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=14.0 PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig DYLD_FALLBACK_LIBRARY_PATH=$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+          # Avoid universal2 since Homebrew giza isn’t universal
+          CIBW_ARCHS_MACOS: "native"
+          # Smoke test to verify import/linking works inside each wheel env
+          CIBW_TEST_COMMAND: >
+            python -c 'import ppgplot; print("ok")'
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-wheels-${{ matrix.os }}
+          path: dist/
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+
+      - name: Build sdist
+        run: python -m build --sdist
+
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-sdist
+          path: dist/*.tar.gz

.github/workflows/publish_to_pypi.yml

@@ -0,0 +1,146 @@
+name: Build and Publish Wheels
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+  workflow_dispatch:  # Manual trigger for testing
+    inputs:
+      dry_run:
+        description: 'Dry run (skip actual PyPI upload)'
+        required: false
+        default: 'true'
+        type: boolean
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]  # add windows-latest later
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Dependencies are now handled by cibuildwheel's before-all hooks
+      # No need to install them on the runner
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install cibuildwheel
+
+      - name: Build wheels
+        run: cibuildwheel --output-dir dist
+        env:
+          # Install system dependencies and build giza from source
+          # giza-devel is not available in AlmaLinux 8 EPEL, so we build from source
+          # Install build dependencies for RHEL/CentOS/AlmaLinux
+          # Fallback for Debian/Ubuntu systems
+          # Download and build giza from source
+          CIBW_BEFORE_ALL_LINUX: |
+            (which apt || which yum || which dnf) &&
+            ((yum install -y gcc make cairo-devel libX11-devel pkgconfig wget tar gzip) ||
+             (apt-get update && apt-get install -y gcc make libcairo2-dev libx11-dev pkg-config wget tar gzip)) &&
+            cd /tmp &&
+            wget https://github.com/danieljprice/giza/archive/refs/tags/v1.4.2.tar.gz &&
+            tar -xzf v1.4.2.tar.gz &&
+            cd giza-1.4.2 &&
+            export CFLAGS=-fPIC &&
+            ./configure --prefix=/usr/local &&
+            make &&
+            make install &&
+            ldconfig
+          CIBW_BEFORE_ALL_MACOS: "brew install giza libx11 pkg-config"
+          CIBW_BEFORE_ALL_WINDOWS: "echo 'Windows support not implemented yet'"
+          # Ensure pkg-config and runtime linker can find giza
+          CIBW_ENVIRONMENT_LINUX: "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH"
+          CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=14.0 PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig DYLD_FALLBACK_LIBRARY_PATH=$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+          # Avoid universal2 since Homebrew giza isn’t universal
+          CIBW_ARCHS_MACOS: "native"
+          # Smoke test to verify import/linking works inside each wheel env
+          CIBW_TEST_COMMAND: >
+            python -c 'import ppgplot; print("ok")'
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-wheels-${{ matrix.os }}
+          path: dist/
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+
+      - name: Build sdist
+        run: python -m build --sdist
+
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-sdist
+          path: dist/*.tar.gz
+
+  publish_pypi:
+    name: Publish to PyPI
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: dist/
+
+      - name: Flatten artifacts
+        run: |
+          find dist/ -name "*.whl" -exec mv {} dist/ \;
+          find dist/ -name "*.tar.gz" -exec mv {} dist/ \;
+          find dist/ -mindepth 1 -type d -exec rm -rf {} + || true
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install Twine
+        run: pip install twine
+
+      - name: Verify distributions
+        run: |
+          ls -la dist/
+          twine check dist/*
+
+      - name: Publish to PyPI
+        if: ${{ !inputs.dry_run }}
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+        run: twine upload dist/*
+
+      - name: Dry run - show what would be uploaded
+        if: ${{ inputs.dry_run }}
+        run: |
+          echo "DRY RUN: Would upload the following files to PyPI:"
+          ls -la dist/
+          echo "Files passed twine check - ready for upload!"

.github/workflows/test_publish.yml

@@ -0,0 +1,120 @@
+name: Test Build and Publish
+
+on:
+  workflow_dispatch:  # Manual trigger
+  push:
+    branches:
+      - test-pypi*  # 
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install cibuildwheel
+
+      - name: Build wheels
+        run: cibuildwheel --output-dir dist
+        env:
+          CIBW_BEFORE_ALL_LINUX: |
+            (which apt || which yum || which dnf) &&
+            ((yum install -y gcc make cairo-devel libX11-devel pkgconfig wget tar gzip) ||
+             (apt-get update && apt-get install -y gcc make libcairo2-dev libx11-dev pkg-config wget tar gzip)) &&
+            cd /tmp &&
+            wget https://github.com/danieljprice/giza/archive/refs/tags/v1.4.2.tar.gz &&
+            tar -xzf v1.4.2.tar.gz &&
+            cd giza-1.4.2 &&
+            export CFLAGS=-fPIC &&
+            ./configure --prefix=/usr/local &&
+            make &&
+            make install &&
+            ldconfig
+          CIBW_BEFORE_ALL_MACOS: "brew install giza libx11 pkg-config"
+          CIBW_ENVIRONMENT_LINUX: "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH"
+          CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=14.0 PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig DYLD_FALLBACK_LIBRARY_PATH=$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+          CIBW_ARCHS_MACOS: "native"
+          CIBW_TEST_COMMAND: >
+            python -c 'import ppgplot; print("ok")'
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-wheels-${{ matrix.os }}
+          path: dist/
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+
+      - name: Build sdist
+        run: python -m build --sdist
+
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-pgplot-sdist
+          path: dist/*.tar.gz
+
+  test_publish:
+    name: Test Publish to Test PyPI
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: dist/
+
+      - name: Flatten artifacts
+        run: |
+          find dist/ -name "*.whl" -exec mv {} dist/ \;
+          find dist/ -name "*.tar.gz" -exec mv {} dist/ \;
+          find dist/ -mindepth 1 -type d -exec rm -rf {} + || true
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install Twine
+        run: pip install twine
+
+      - name: Verify distributions
+        run: |
+          ls -la dist/
+          twine check dist/*
+
+      - name: Publish to Test PyPI
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        run: twine upload --repository testpypi dist/*

CHANGELOG

@@ -1,3 +1,9 @@
+version 1.6
+  - Python2/3 compatibility, numpy 1.x/2.x compatibility
+  - github actions to build wheels and publish to (test)PyPI
+  - setup.py can build source dists
+version 1.5*
+  - Fake version for experimenting w/ PyPI by n00b
 version 1.4
   - Now ppgplot uses the "numpy" module by default, reverting to "numarray"
     and then "Numeric", respectively, if the preferred module is not found.

CONTRIBUTORS

@@ -1,6 +1,11 @@
 
 PPGPLOT CONTRIBUTORS:
 
+Marjolein Verkouter continued supporting a fork of NickP's repo, making it
+Py2/Py3, numpy1.x/2.x  compatible, and make the extension pip-installable.
+Added some functionality and incorporated patches from C. Bassa on his fork
+of the original repo.
+
 Steven Bamford adapted ppgplot in 2007 to use numpy, in favour of the
 depreciated numarray and Numeric modules, and included these minor
 changes (mostly to setup.py) in the Google Code version (1.4) in April