Merge remote-tracking branch 'upstream/main' into register-performanc…

…e-metrics

.github/workflows/build-and-test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
+        os: ["macos-13", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
       fail-fast: false
 
     steps:
@@ -24,17 +24,17 @@ jobs:
         (Get-ItemProperty "HKLM:System\CurrentControlSet\Control\FileSystem").LongPathsEnabled
         $os_version = (Get-CimInstance Win32_OperatingSystem).version
         Echo "OS_VERSION=$os_version" >> $env:GITHUB_ENV
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
         cache-dependency-path: "**/python/pyproject.toml"
     - name: "Restore RTools40"
       if: startsWith(runner.os, 'Windows')
       id: cache-rtools
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: C:/rtools40
         key: ${{ runner.os }}-${{ env.OS_VERSION }}-rtools-v1
@@ -58,7 +58,7 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: r-lib/actions/setup-pandoc@v2
     - name: Set up R
       uses: r-lib/actions/setup-r@v2
@@ -75,7 +75,7 @@ jobs:
       shell: Rscript {0}
     - name: Restore R package cache
       if: runner.os != 'Windows'
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.R_LIBS_USER }}
         key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/wheel.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
+        os: ["macos-13", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
         cibw_arch: ["native"]
         # Build one wheel (ABI = none) using first build spec, then test on all python versions.
         cibw_build: ["cp39-* cp310-* cp311-*"]
@@ -38,34 +38,28 @@ jobs:
       - name: "Checkout repo"
         uses: actions/checkout@v4
 
-      # Temporary, until pipx is added to the macOS large runner image
-      - name: "Install pipx"
-        if: matrix.os == 'macos-latest-xlarge'
-        run: |
-          brew install pipx
-          pipx ensurepath
-
       - name: "Restore RTools40"
         if: startsWith(runner.os, 'Windows')
         id: cache-rtools
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: C:/rtools40
           key: ${{ runner.os }}-${{ env.OS_VERSION }}-rtools-v1
 
       - name: Set up QEMU
         if: matrix.cibw_arch == 'aarch64'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
       - name: "Build wheels"
-        uses: pypa/cibuildwheel@v2.16.2
+        uses: pypa/cibuildwheel@v2.21.1
         with:
           package-dir: python
         env:
           CIBW_ENVIRONMENT: >
             STAN_BACKEND="${{ env.STAN_BACKEND }}"
+            MACOSX_DEPLOYMENT_TARGET="${{ matrix.os == 'macos-13' && 10.11 || 11.0 }}"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_SKIP: "*musllinux*"
@@ -75,7 +69,7 @@ jobs:
           CIBW_TEST_COMMAND: pytest --pyargs prophet
 
       - name: "Upload wheel as artifact"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-wheel
           path: "./**/*.whl"
@@ -84,12 +78,12 @@ jobs:
     name: Make source distribution
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: pipx run build --sdist
       working-directory: python
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: artifact-source-dist
         path: "./**/dist/*.tar.gz"
@@ -99,9 +93,12 @@ jobs:
     needs: [make-wheels, make-sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
+    environment: release
+    permissions:
+      id-token: write
     steps:
     - name: Download all artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
 
     - name: Copy artifacts to dist/ folder
       run: |
@@ -111,7 +108,4 @@ jobs:
         find . -name '*.whl' -exec mv '{}' dist/ \;
 
     - name: Upload
-      uses: pypa/gh-action-pypi-publish@v1.4.2
-      with:
-        user: ${{ secrets.PYPI_USERNAME }}
-        password: ${{ secrets.PYPI_PASSWORD }}
+      uses: pypa/gh-action-pypi-publish@v1.10.2

R/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: prophet
 Title: Automatic Forecasting Procedure
-Version: 1.1.5
-Date: 2023-10-10
+Version: 1.1.6
+Date: 2024-09-29
 Authors@R: c(
   person("Sean", "Taylor", email = "sjtz@pm.me", role = c("cre", "aut")),
   person("Ben", "Letham", email = "bletham@fb.com", role = "aut")