From c9301685466b5dc8d0c94eef03c791c1c0db3856 Mon Sep 17 00:00:00 2001
From: Cuong Duong <cuong.duong242@gmail.com>
Date: Tue, 30 May 2023 00:26:57 +1000
Subject: [PATCH] Bump version numbers for release (#2441)

---
 R/DESCRIPTION                 |  4 ++--
 README.md                     | 39 +++++++++++++++++++++++++++++++++--
 python/prophet/__version__.py |  2 +-
 python/prophet/hdays.py       | 21 ++++++++++++-------
 4 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/R/DESCRIPTION b/R/DESCRIPTION
index de64148fc..fb02881ea 100644
--- a/R/DESCRIPTION
+++ b/R/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: prophet
 Title: Automatic Forecasting Procedure
-Version: 1.1.2
-Date: 2023-01-20
+Version: 1.1.4
+Date: 2023-05-30
 Authors@R: c(
   person("Sean", "Taylor", email = "sjtz@pm.me", role = c("cre", "aut")),
   person("Ben", "Letham", email = "bletham@fb.com", role = "aut")
diff --git a/README.md b/README.md
index bfe4816f8..7ff976db8 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,12 @@ Prophet is [open source software](https://code.facebook.com/projects/) released
 - Contributing: https://facebook.github.io/prophet/docs/contributing.html
 - Prophet R package: https://cran.r-project.org/package=prophet
 - Prophet Python package: https://pypi.python.org/pypi/prophet/
-- Release blogpost: https://research.fb.com/prophet-forecasting-at-scale/
+- Release blogpost: https://research.facebook.com/blog/2017/2/prophet-forecasting-at-scale/
 - Prophet paper: Sean J. Taylor, Benjamin Letham (2018) Forecasting at scale. The American Statistician 72(1):37-45 (https://peerj.com/preprints/3190.pdf).
 
-## Installation in R
+## Installation in R - CRAN
+
+⚠️ **The CRAN version of prophet is fairly outdated. To get the latest bug fixes and updated country holiday data, we suggest installing the latest release with remotes::install_github().**
 
 Prophet is a [CRAN package](https://cran.r-project.org/package=prophet) so you can use `install.packages`.
 
@@ -44,6 +46,13 @@ install.packages('prophet')
 
 After installation, you can [get started!](https://facebook.github.io/prophet/docs/quick_start.html#r-api)
 
+## Installation in R - Latest release
+
+```r
+install.packages('remotes')
+remotes::install_github('facebook/prophet@*release')
+```
+
 #### Experimental backend - cmdstanr
 
 You can also choose an experimental alternative stan backend called `cmdstanr`. Once you've installed `prophet`,
@@ -117,6 +126,32 @@ Using `cmdstanpy` with Windows requires a Unix-compatible C compiler such as min
 
 ## Changelog
 
+### Version 1.1.4 (2023.05.30)
+
+#### Python
+
+- We now rely solely on `holidays` package for country holidays.
+- Upgraded cmdstan version to 2.31.0, enabling Apple M1 support.
+- Fixed bug with Windows installation caused by long paths.
+
+#### R
+
+- Updated `holidays` data based on holidays version 0.25.
+
+### Version 1.1.2 (2023.01.20)
+
+#### Python
+
+- Sped up `.predict()` by up to 10x by removing intermediate DataFrame creations.
+- Sped up fourier series generation, leading to at least 1.5x speed improvement for `train()` and `predict()` pipelines.
+- Fixed bug in how warm start values were being read.
+- Wheels are now version-agnostic.
+
+#### R
+
+- Fixed a bug in `construct_holiday_dataframe()`
+- Updated `holidays` data based on holidays version 0.18.
+
 ### Version 1.1.1 (2022.09.08)
 
 - (Python) Improved runtime (3-7x) of uncertainty predictions via vectorization.
diff --git a/python/prophet/__version__.py b/python/prophet/__version__.py
index 0b2f79dbb..c72e3798a 100644
--- a/python/prophet/__version__.py
+++ b/python/prophet/__version__.py
@@ -1 +1 @@
-__version__ = "1.1.3"
+__version__ = "1.1.4"
diff --git a/python/prophet/hdays.py b/python/prophet/hdays.py
index 850f4c279..144796994 100644
--- a/python/prophet/hdays.py
+++ b/python/prophet/hdays.py
@@ -17,6 +17,11 @@
 from dateutil.easter import easter, EASTER_ORTHODOX
 from dateutil.relativedelta import relativedelta as rd
 
+warnings.warn(
+    "hdays module is deprecated and will be removed in prophet 1.1.5. All holidays should be read directly from the holidays package.",
+    FutureWarning,
+)
+
 
 # Official public holidays at a country level
 # ------------ Holidays in Indonesia---------------------
@@ -441,15 +446,15 @@ def _populate(self, year):
         # Nooruz Mairamy
         name = "Nooruz Mairamy"
         self[date(year, 3, 21)] = name
-        
+
         # Day of the People's April Revolution
         name = "Day of the People's April Revolution"
         self[date(year, 4, 7)] = name
-        
+
         # Spring and Labour Day
         name = "Spring and Labour Day"
         self[date(year, 5, 1)] = name
-        
+
         # Constitution Day
         name = "Constitution Day"
         self[date(year, 5, 5)] = name
@@ -461,15 +466,15 @@ def _populate(self, year):
         # Children's Day
         name = "Russia Day"
         self[date(year, 6, 1)] = name
-        
+
         # Independence Day
         name = "Independence Day"
         self[date(year, 8, 31)] = name
-        
+
         # Day 1 of History and Commemoration of Ancestors
         name = "Day 1 of History and Commemoration of Ancestors"
         self[date(year, 11, 7)] = name
-        
+
         # Day 2 of History and Commemoration of Ancestors
         name = "Day 2 of History and Commemoration of Ancestors"
         self[date(year, 11, 8)] = name
@@ -477,9 +482,9 @@ def _populate(self, year):
         # New Year's Eve
         name = "New Year's Eve"
         self[date(year, 12, 31)] = name
-        
+
         # Islamic Holidays
-        
+
         # Eid ul-Fitr
         # 1st and 2nd day of 10th Islamic month
         name = "Eid al-Fitr"