Skip to content

Commit

Permalink
correct mixup in versions
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/sstoeckl/ffdownload

# Conflicts:
#	CRAN-SUBMISSION
#	DESCRIPTION
#	README.md
#	vignettes/README-FFpic-1.png
  • Loading branch information
sstoeckl committed Jun 17, 2024
2 parents 5af826a + c3127b7 commit c5fe781
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.1.0
Date: 2023-10-04 18:19:08 UTC
SHA: b0f649ed9ff66b84d227589cf1c93fd750a5d795
Version: 1.1.1
Date: 2023-10-11 11:52:44 UTC
SHA: 4863691f82316ed11d9a3033e1985634043a2e03
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: FFdownload
Type: Package
Title: Download Data from Kenneth French's Website
Version: 1.1.0.99
Version: 1.1.1
Authors@R: c(person("Sebastian", "Stoeckl", email = "[email protected]", role = c("aut","cre"), comment = c(ORCID = "0000-0002-4196-6093", "Package commissioner and maintainer.")),
person("Annar", "Massimov", email = "", role = c("ctb"), comment = "Original developer of FFdownload."))
Description: Downloads all the datasets (you can exclude the daily ones or specify a list of those you are targeting specifically) from Kenneth French's Website at <https://mba.tuck.dartmouth.edu/pages/faculty/ken.french/data_library.html>, process them and convert them to list of 'xts' (time series).
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# FFdownload 1.1.1

* Release to CRAN after previous package version has been archived due to a broken travis link.

# FFdownload 1.1

* Resubmit to CRAN
Expand Down
5 changes: 2 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![Project Status](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![Travis build status](https://travis-ci.org/sstoeckl/ffdownload.svg?branch=master)](https://travis-ci.org/sstoeckl/ffdownload)

[![CRAN_latest_release_date](https://www.r-pkg.org/badges/last-release/FFdownload)](https://cran.r-project.org/package=FFdownload)
[![CRAN status](https://www.r-pkg.org/badges/version/FFdownload)](https://CRAN.R-project.org/package=FFdownload)
[![CRAN downloads](https://cranlogs.r-pkg.org/badges/grand-total/FFdownload)](https://cranlogs.r-pkg.org/badges/grand-total/FFdownload)
Expand All @@ -26,12 +26,11 @@ knitr::opts_chunk$set(
[![Website - pkgdown](https://img.shields.io/website-up-down-green-red/https/sstoeckl.github.io/ffdownload.svg)](https://sstoeckl.github.io/ffdownload/)
<!-- badges: end -->


# `R` Code to download Datasets from [Kenneth French's famous website](http://mba.tuck.dartmouth.edu/pages/faculty/ken.french/data_library.html).

# Update

With version 1.1.0 we have added the possibility to format the data sets saved in the list as `tibble` for direct proceeding.
Version 1.1.1 corrects a small error for publication on CRAN.

## Motivation

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

[![Project
Status](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![Travis build
status](https://travis-ci.org/sstoeckl/ffdownload.svg?branch=master)](https://travis-ci.org/sstoeckl/ffdownload)

[![CRAN_latest_release_date](https://www.r-pkg.org/badges/last-release/FFdownload)](https://cran.r-project.org/package=FFdownload)
[![CRAN
status](https://www.r-pkg.org/badges/version/FFdownload)](https://CRAN.R-project.org/package=FFdownload)
Expand All @@ -28,8 +27,7 @@ pkgdown](https://img.shields.io/website-up-down-green-red/https/sstoeckl.github.

# Update

With version 1.1.0 we have added the possibility to format the data sets
saved in the list as `tibble` for direct proceeding.
Version 1.1.1 corrects a small error for publication on CRAN.

## Motivation

Expand Down
11 changes: 5 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
## Resubmission
This is a resubmission. In this version I have:
This is a resubmission to a previously archived version. In this version I have:

* corrected some errors with downloading and renamed a directory variable that was the same as the command belonging to it.
* Fix too long line
* deleted a non-working link

## Test environments
* local R installation, R 4.0.2
* ubuntu 16.04 (on travis-ci), R 4.0.2
* local R installation, R 4.3.1
* ubuntu 16.04 (on travis-ci), R 4.3.1
* win-builder (devel)

## R CMD check results

0 errors | 0 warnings | 1 note
0 errors | 1 warnings | 0 note

* This is a new release.

0 comments on commit c5fe781

Please sign in to comment.