Skip to content

Commit 8c87820

Browse files
committed
Merge remote-tracking branch 'upstream/main' into register-performance-metrics
2 parents fba3a48 + 2a57e9d commit 8c87820

File tree

10 files changed

+32163
-22732
lines changed

10 files changed

+32163
-22732
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
python-version: ["3.10"]
16-
os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
16+
os: ["macos-13", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
1717
fail-fast: false
1818

1919
steps:
@@ -24,17 +24,17 @@ jobs:
2424
(Get-ItemProperty "HKLM:System\CurrentControlSet\Control\FileSystem").LongPathsEnabled
2525
$os_version = (Get-CimInstance Win32_OperatingSystem).version
2626
Echo "OS_VERSION=$os_version" >> $env:GITHUB_ENV
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@v5
3030
with:
3131
python-version: ${{ matrix.python-version }}
3232
cache: pip
3333
cache-dependency-path: "**/python/pyproject.toml"
3434
- name: "Restore RTools40"
3535
if: startsWith(runner.os, 'Windows')
3636
id: cache-rtools
37-
uses: actions/cache@v3
37+
uses: actions/cache@v4
3838
with:
3939
path: C:/rtools40
4040
key: ${{ runner.os }}-${{ env.OS_VERSION }}-rtools-v1
@@ -58,7 +58,7 @@ jobs:
5858
RSPM: ${{ matrix.config.rspm }}
5959

6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
- uses: r-lib/actions/setup-pandoc@v2
6363
- name: Set up R
6464
uses: r-lib/actions/setup-r@v2
@@ -75,7 +75,7 @@ jobs:
7575
shell: Rscript {0}
7676
- name: Restore R package cache
7777
if: runner.os != 'Windows'
78-
uses: actions/cache@v3
78+
uses: actions/cache@v4
7979
with:
8080
path: ${{ env.R_LIBS_USER }}
8181
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/wheel.yml

+13-19
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
os: ["macos-latest", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
18+
os: ["macos-13", "ubuntu-latest", "windows-latest", "macos-latest-xlarge"]
1919
cibw_arch: ["native"]
2020
# Build one wheel (ABI = none) using first build spec, then test on all python versions.
2121
cibw_build: ["cp39-* cp310-* cp311-*"]
@@ -38,34 +38,28 @@ jobs:
3838
- name: "Checkout repo"
3939
uses: actions/checkout@v4
4040

41-
# Temporary, until pipx is added to the macOS large runner image
42-
- name: "Install pipx"
43-
if: matrix.os == 'macos-latest-xlarge'
44-
run: |
45-
brew install pipx
46-
pipx ensurepath
47-
4841
- name: "Restore RTools40"
4942
if: startsWith(runner.os, 'Windows')
5043
id: cache-rtools
51-
uses: actions/cache@v3
44+
uses: actions/cache@v4
5245
with:
5346
path: C:/rtools40
5447
key: ${{ runner.os }}-${{ env.OS_VERSION }}-rtools-v1
5548

5649
- name: Set up QEMU
5750
if: matrix.cibw_arch == 'aarch64'
58-
uses: docker/setup-qemu-action@v2
51+
uses: docker/setup-qemu-action@v3
5952
with:
6053
platforms: arm64
6154

6255
- name: "Build wheels"
63-
uses: pypa/cibuildwheel@v2.16.2
56+
uses: pypa/cibuildwheel@v2.21.1
6457
with:
6558
package-dir: python
6659
env:
6760
CIBW_ENVIRONMENT: >
6861
STAN_BACKEND="${{ env.STAN_BACKEND }}"
62+
MACOSX_DEPLOYMENT_TARGET="${{ matrix.os == 'macos-13' && 10.11 || 11.0 }}"
6963
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
7064
CIBW_BUILD: ${{ matrix.cibw_build }}
7165
CIBW_SKIP: "*musllinux*"
@@ -75,7 +69,7 @@ jobs:
7569
CIBW_TEST_COMMAND: pytest --pyargs prophet
7670

7771
- name: "Upload wheel as artifact"
78-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7973
with:
8074
name: artifact-${{ matrix.os }}-${{ matrix.cibw_arch }}-wheel
8175
path: "./**/*.whl"
@@ -84,12 +78,12 @@ jobs:
8478
name: Make source distribution
8579
runs-on: ubuntu-latest
8680
steps:
87-
- uses: actions/checkout@v3
81+
- uses: actions/checkout@v4
8882

8983
- run: pipx run build --sdist
9084
working-directory: python
9185

92-
- uses: actions/upload-artifact@v3
86+
- uses: actions/upload-artifact@v4
9387
with:
9488
name: artifact-source-dist
9589
path: "./**/dist/*.tar.gz"
@@ -99,9 +93,12 @@ jobs:
9993
needs: [make-wheels, make-sdist]
10094
runs-on: ubuntu-latest
10195
if: github.event_name == 'release' && github.event.action == 'published'
96+
environment: release
97+
permissions:
98+
id-token: write
10299
steps:
103100
- name: Download all artifacts
104-
uses: actions/download-artifact@v3
101+
uses: actions/download-artifact@v4
105102

106103
- name: Copy artifacts to dist/ folder
107104
run: |
@@ -111,7 +108,4 @@ jobs:
111108
find . -name '*.whl' -exec mv '{}' dist/ \;
112109
113110
- name: Upload
114-
uses: pypa/[email protected]
115-
with:
116-
user: ${{ secrets.PYPI_USERNAME }}
117-
password: ${{ secrets.PYPI_PASSWORD }}
111+
uses: pypa/[email protected]

R/DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: prophet
22
Title: Automatic Forecasting Procedure
3-
Version: 1.1.5
4-
Date: 2023-10-10
3+
Version: 1.1.6
4+
Date: 2024-09-29
55
Authors@R: c(
66
person("Sean", "Taylor", email = "[email protected]", role = c("cre", "aut")),
77
person("Ben", "Letham", email = "[email protected]", role = "aut")

0 commit comments

Comments
 (0)