FiberFusing 1.6.0__tar.gz → 1.7.0__tar.gz

fiberfusing-1.7.0/.github/workflows/deploy_PyPI.yml

@@ -0,0 +1,20 @@
+name: Deploy to PyPi
+
+on:
+  push:
+    branches: [ "master" ]
+    tags:
+      - '*'
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+    contents: write
+
+jobs:
+  pure_package:
+    uses: MartinPdeS/MPSActions/.github/workflows/publish_pure_package_to_PyPi.yml@master
+    with:
+      python-version: "3.11"
+    secrets:
+      PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}

fiberfusing-1.7.0/.github/workflows/deploy_anaconda.yml

@@ -0,0 +1,21 @@
+name: Deploy Conda Packages
+
+on:
+  push:
+    branches: [ "master" ]
+    tags:
+      - '*'
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+    contents: write
+
+jobs:
+  ManyLinux_x86_64:
+    uses: MartinPdeS/MPSActions/.github/workflows/publish_compiled_package_to_anaconda.yml@master
+    with:
+      python-versions: '["3.11", "3.12"]'
+    secrets:
+      ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
+

fiberfusing-1.7.0/.github/workflows/deploy_coverage.yml

@@ -0,0 +1,25 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy coverage
+
+on:
+  push:
+    branches: [ "master" ]
+    tags:
+      - '*'
+  pull_request:
+    branches: [ "master" ]
+
+
+# Sets permissions of the  GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  ManyLinux_x86_64:
+    uses: MartinPdeS/MPSActions/.github/workflows/publish_coverage.yml@master
+    with:
+      python-version: "3.11"
+    secrets:
+      _GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

fiberfusing-1.7.0/.github/workflows/deploy_documentation.yml

@@ -0,0 +1,24 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy documentation to github page
+
+on:
+  push:
+    branches: [ "master" ]
+    tags:
+      - '*'
+  pull_request:
+    branches: [ "master" ]
+
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  ManyLinux_x86_64:
+    uses: MartinPdeS/MPSActions/.github/workflows/publish_documentation.yml@master
+    with:
+      python-version: "3.11"
+      package-name: "FiberFusing"

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/FiberFusing/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.7.0'
+__version_tuple__ = version_tuple = (1, 7, 0)

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/FiberFusing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: FiberFusing
-Version: 1.6.0
+Version: 1.7.0
 Summary: A package fiber fusing configuration simulating the transverse fusion of fiber optics.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -44,7 +44,7 @@ License-File: LICENSE
 Requires-Dist: pyyaml~=6.0
 Requires-Dist: pydantic>=2.9
 Requires-Dist: scipy~=1.11
-Requires-Dist: numpy<3.0,>=1.26
+Requires-Dist: numpy>=1.26
 Requires-Dist: shapely~=2.0
 Requires-Dist: MPSPlots
 Requires-Dist: PyOptik
@@ -58,8 +58,9 @@ Provides-Extra: documentation
 Requires-Dist: numpydoc~=1.8; extra == "documentation"
 Requires-Dist: sphinx>=6; extra == "documentation"
 Requires-Dist: sphinx-gallery~=0.17; extra == "documentation"
-Requires-Dist: sphinx-rtd-theme~=2.0; extra == "documentation"
+Requires-Dist: sphinx-rtd-theme<4,>=2; extra == "documentation"
 Requires-Dist: pydata-sphinx-theme~=0.15; extra == "documentation"
+Dynamic: license-file
 
 FiberFusing
 ===========

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/FiberFusing.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ meta.yaml
 notebook.ipynb
 pyproject.toml
 .github/dependabot.yml
-.github/workflows/build_documentation.yml
 .github/workflows/deploy_PyPI.yml
 .github/workflows/deploy_anaconda.yml
 .github/workflows/deploy_coverage.yml

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/FiberFusing.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pyyaml~=6.0
 pydantic>=2.9
 scipy~=1.11
-numpy<3.0,>=1.26
+numpy>=1.26
 shapely~=2.0
 MPSPlots
 PyOptik
@@ -10,7 +10,7 @@ PyOptik
 numpydoc~=1.8
 sphinx>=6
 sphinx-gallery~=0.17
-sphinx-rtd-theme~=2.0
+sphinx-rtd-theme<4,>=2
 pydata-sphinx-theme~=0.15
 
 [testing]

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: FiberFusing
-Version: 1.6.0
+Version: 1.7.0
 Summary: A package fiber fusing configuration simulating the transverse fusion of fiber optics.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -44,7 +44,7 @@ License-File: LICENSE
 Requires-Dist: pyyaml~=6.0
 Requires-Dist: pydantic>=2.9
 Requires-Dist: scipy~=1.11
-Requires-Dist: numpy<3.0,>=1.26
+Requires-Dist: numpy>=1.26
 Requires-Dist: shapely~=2.0
 Requires-Dist: MPSPlots
 Requires-Dist: PyOptik
@@ -58,8 +58,9 @@ Provides-Extra: documentation
 Requires-Dist: numpydoc~=1.8; extra == "documentation"
 Requires-Dist: sphinx>=6; extra == "documentation"
 Requires-Dist: sphinx-gallery~=0.17; extra == "documentation"
-Requires-Dist: sphinx-rtd-theme~=2.0; extra == "documentation"
+Requires-Dist: sphinx-rtd-theme<4,>=2; extra == "documentation"
 Requires-Dist: pydata-sphinx-theme~=0.15; extra == "documentation"
+Dynamic: license-file
 
 FiberFusing
 ===========

{fiberfusing-1.6.0 → fiberfusing-1.7.0}/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "pyyaml ~= 6.0",
     "pydantic >=2.9",
     "scipy ~=1.11",
-    "numpy >=1.26,<3.0",
+    "numpy >=1.26",
     "shapely ~=2.0",
     "MPSPlots",
     "PyOptik"
@@ -60,7 +60,7 @@ documentation = [
     "numpydoc ~=1.8",
     "sphinx >=6",
     "sphinx-gallery ~=0.17",
-    "sphinx-rtd-theme ~=2.0",
+    "sphinx-rtd-theme >=2,<4",
     "pydata-sphinx-theme ~=0.15"
 ]
 

fiberfusing-1.6.0/.github/workflows/build_documentation.yml

@@ -1,60 +0,0 @@
-# .github/workflows/deploy_documentation.yml
-name: Documentation
-
-on:
-  push:
-    branches: [ "master" ]
-    tags:
-      - '*'
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  documentation:
-    name: Run the documentation building tools
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-
-    steps:
-      - name: "Set-up: Python 3.11"
-        uses: actions/setup-python@v5
-        id: cp311
-        with:
-            python-version: 3.11
-
-      - name: "Install: Dependencies for headless server"
-        shell: bash
-        run: |
-            sudo apt-get update
-            sudo apt-get install -y xvfb jq
-
-      - name: "Checkout requirements and files for testing"
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-          ref: master
-
-      - name: Install everything, run the tests, produce the .coverage file
-        run: |
-          python -m pip install wheel build
-          python -m build --wheel
-          python -m pip install .[documentation]
-
-      - name: Get current tag
-        id: get_tag
-        run: |
-          git fetch --tags
-          echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-
-      - name: "Sphinx build"
-        run: |
-          sphinx-build docs/source documentation_build
-
-      - name: "Upload Documentation Artifact"
-        uses: actions/upload-artifact@v4
-        with:
-          name: documentation_build
-          path: documentation_build

fiberfusing-1.6.0/.github/workflows/deploy_PyPI.yml

@@ -1,30 +0,0 @@
-name: Deploy Wheel to PyPi
-
-on:
-  push:
-    branches: [ "master" ]
-    tags:
-      - '*'
-  pull_request:
-    branches: [ "master" ]
-
-permissions:
-    contents: write
-
-jobs:
-    build_pure_python:
-        runs-on: ubuntu-latest
-        steps:
-          - uses: MartinPdeS/MPSActions/build_pure_python_package@master
-            with:
-                python-version: '3.10'
-
-    publish_wheel:
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-        needs: [build_pure_python]
-        runs-on: ubuntu-latest
-        steps:
-          - uses: MartinPdeS/MPSActions/publish_pypi@master
-            with:
-                python-version: "3.10"
-                password: ${{ secrets.PYPI_API_TOKEN }}

fiberfusing-1.6.0/.github/workflows/deploy_anaconda.yml

@@ -1,34 +0,0 @@
-name: Deploy Conda Package
-
-on:
-  push:
-    branches: [ "master" ]
-    tags:
-      - '*'
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build_and_publish_conda_package:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Set up Miniconda
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          channels: conda-forge
-          python-version: '3.11'
-
-      - name: Upload to Anaconda (if tag)
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-        run: |
-          conda config --set anaconda_upload true
-
-      - name: Create Conda Environment and Install Dependencies
-        env:
-          ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}  # Ensure the Anaconda token is set
-        run: |
-          conda install conda-build anaconda-client conda-verify -y
-          conda build . -c martinpdes

fiberfusing-1.6.0/.github/workflows/deploy_coverage.yml

@@ -1,52 +0,0 @@
-# .github/workflows/coverage.yml
-name: Coverage
-
-on:
-  push:
-    branches: [ "master" ]
-    tags:
-      - '*'
-  pull_request:
-    branches: [ "master" ]
-
-
-jobs:
-  coverage:
-    name: Run test and generate coverage data
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-
-    steps:
-      - name: "Set-up: Python ${{ env.cp_python_version }}"
-        uses: actions/setup-python@v4
-        id: cp310
-        with:
-            python-version: "3.10"
-
-      - name: "Install: Dependencies for headless server"
-        shell: bash
-        run: |
-            sudo apt-get update
-            sudo apt-get install xvfb
-
-      - name: "Checkout requirements and files for testing"
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-
-      - name: Install everything, run the tests, produce the .coverage file
-        run: |
-          python -m pip install wheel build
-          python -m build --wheel
-          python -m pip install .[testing]
-          pytest
-
-      - name: Coverage comment
-        uses: py-cov-action/python-coverage-comment-action@v3
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MINIMUM_GREEN: 90
-          MINIMUM_ORANGE: 50

fiberfusing-1.6.0/.github/workflows/deploy_documentation.yml

@@ -1,123 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy static content to Pages
-
-
-on:
-  workflow_run:
-    workflows: ["Documentation"]  # This references the name of the first workflow
-    types:
-      - completed  # Run when the Documentation workflow is completed successfully
-
-
-# Sets permissions of the GITHUB_TOKEN  to allow deployment to GitHub Pages
-permissions:
-  contents: write
-  pages: write
-  id-token: write
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: documentation_page
-
-      - name: Set up Git user
-        run: |
-          git config --global user.name  "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
-      - name: Download artifact
-        id: download-artifact
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          workflow: build_documentation.yml
-          name: documentation_build
-          path: ./documentation_build
-
-      - name: Get current tag
-        id: get_tag
-        run: |
-          # Fetch all tags to ensure they are available
-          git fetch --tags
-          git tag -l
-
-          # Get the latest tag by creation date
-          TAG=$(git tag --sort=-creatordate | head -n 1)
-
-          # Fallback to a default tag if no tag is found
-          if [ -z "$TAG" ]; then
-            TAG="0.0.0.0"
-          fi
-
-          echo "tag=$TAG" >> $GITHUB_ENV
-          echo "Tag found or default: $TAG"
-
-      - name: Update new documentation version
-        run: |
-          rm -rf docs/${{ env.tag }}
-          mv documentation_build docs/${{ env.tag }}
-
-      - name: Scan, sort versions, and update version_switcher.json
-        run: |
-          # Define the path to version_switcher.json
-          json_file="version_switcher.json"
-          rm $json_file
-          docs_path="docs"
-          base_url="https://martinpdes.github.io/FiberFusing"
-
-          # Start the JSON array
-          echo "[" > $json_file
-
-          # Get sorted version directories in descending order
-          version_dirs=$(ls -v $docs_path | sort -V -r)
-
-
-          # Loop over sorted versions and add to JSON file
-          first_entry=true
-          for version in $version_dirs; do
-            version_url="${base_url}/${docs_path}/${version}"
-
-            # Add a comma if it's not the first entry
-            if [ "$first_entry" = true ]; then
-              first_entry=false
-            else
-              echo "," >> $json_file
-            fi
-
-            # Append each version as a JSON entry
-            jq -n \
-              --arg name "$version" \
-              --arg version "$version" \
-              --arg url "$version_url" \
-              '{name: $name, version: $version, url: $url}' >> $json_file
-          done
-
-          # End the JSON array
-          echo "]" >> $json_file
-
-          # Add and commit the updated version_switcher.json
-          git add $json_file
-          echo $json_file
-          git add docs/
-          git commit --allow-empty -m "Update version_switcher.json"
-          git push origin HEAD
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: '.'
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4