From ce5bcdc46e2de68f9c03ff17931ea2d5c4d031b2 Mon Sep 17 00:00:00 2001 From: RLumSK Date: Fri, 3 Nov 2023 15:21:11 +0100 Subject: [PATCH] Pre-release build --- .zenodo.json | 4 ++-- DESCRIPTION | 4 ++-- NEWS.Rmd | 5 +++-- NEWS.md | 6 +++--- codemeta.json | 7 ++++--- man/convert_xy2TKA.Rd | 2 +- man/read_xyData.Rd | 2 +- ...RNING => rxylib-Ex.timings.0.2.12.WARNING} | 0 ...7.pdf => rxylib-TimingExamples.0.2.12.pdf} | Bin 4537 -> 4538 bytes ...ctions.csv => rxylib_0.2.12-Functions.csv} | 4 ++-- ...ions.html => rxylib_0.2.12-Functions.html} | 12 ++++++------ ...ctions.tex => rxylib_0.2.12-Functions.tex} | 4 ++-- ...md => rxylib_0.2.12-Functions_Markdown.md} | 10 +++++----- ...phy.bib => rxylib_0.2.12-bibliography.bib} | 2 +- ...bib => rxylib_0.2.12-fun_bibliography.bib} | 4 ++-- .../rxylib_0.2.12.9000-17.tar.gz | Bin 118246 -> 0 bytes ...b_0.2.12.9000-17.pdf => rxylib_0.2.12.pdf} | Bin 106760 -> 103484 bytes rxylib.BuildResults/rxylib_0.2.12.tar.gz | Bin 0 -> 118260 bytes 18 files changed, 34 insertions(+), 32 deletions(-) rename rxylib.BuildResults/{rxylib-Ex.timings.0.2.12.9000-17.WARNING => rxylib-Ex.timings.0.2.12.WARNING} (100%) rename rxylib.BuildResults/{rxylib-TimingExamples.0.2.12.9000-17.pdf => rxylib-TimingExamples.0.2.12.pdf} (84%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-Functions.csv => rxylib_0.2.12-Functions.csv} (93%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-Functions.html => rxylib_0.2.12-Functions.html} (94%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-Functions.tex => rxylib_0.2.12-Functions.tex} (93%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-Functions_Markdown.md => rxylib_0.2.12-Functions_Markdown.md} (92%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-bibliography.bib => rxylib_0.2.12-bibliography.bib} (79%) rename rxylib.BuildResults/{rxylib_0.2.12.9000-17-fun_bibliography.bib => rxylib_0.2.12-fun_bibliography.bib} (84%) delete mode 100644 rxylib.BuildResults/rxylib_0.2.12.9000-17.tar.gz rename rxylib.BuildResults/{rxylib_0.2.12.9000-17.pdf => rxylib_0.2.12.pdf} (82%) create mode 100644 rxylib.BuildResults/rxylib_0.2.12.tar.gz diff --git a/.zenodo.json b/.zenodo.json index 3a34a25..123647b 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -33,10 +33,10 @@ "relation": "isReferencedBy" } ], - "version": "0.2.12.9000-17", + "version": "0.2.12", "upload_type": "software", "keywords": ["data import", "power diffraction", "R"], - "publication_date": "2023-09-20", + "publication_date": "2023-11-03", "creators": [ { "orcid": "0000-0002-0734-2199", diff --git a/DESCRIPTION b/DESCRIPTION index e563b67..dd509df 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,8 +3,8 @@ Type: Package Title: Import XY-Data into R Description: Provides access to the 'xylib' C library for to import xy data from powder diffraction, spectroscopy and other experimental methods. -Version: 0.2.12.9000-17 -Date: 2023-09-20 +Version: 0.2.12 +Date: 2023-11-03 Author: Sebastian Kreutzer [aut, trl, cre] (), Johannes Friedrich [aut] (), RLum Team [ctb], diff --git a/NEWS.Rmd b/NEWS.Rmd index 36a28c8..745c421 100644 --- a/NEWS.Rmd +++ b/NEWS.Rmd @@ -10,6 +10,7 @@ header-includes: **This version has C++17 as a system requirement.** -* `read_xyData()` no throws more meaningful errors if the underlying library throws +* `read_xyData()` now throws more meaningful errors if the underlying library throws errors. -* Update `xrdml.cpp` to work with nodes of type "counts" instead of "intensities" +* Update `xrdml.cpp` to work with nodes of type "counts" instead of "intensities" (depending +on what is available) diff --git a/NEWS.md b/NEWS.md index e794fb5..6a07e60 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,11 +5,11 @@ -## Changes in version 0.2.12.9000-17 (2023-09-20) +## Changes in version 0.2.12 (2023-11-03) **This version has C++17 as a system requirement.** -- `read_xyData()` no throws more meaningful errors if the underlying +- `read_xyData()` now throws more meaningful errors if the underlying library throws errors. - Update `xrdml.cpp` to work with nodes of type “counts” instead of - “intensities” + “intensities” (depending on what is available) diff --git a/codemeta.json b/codemeta.json index f3dba26..7327b7a 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,13 +7,13 @@ "codeRepository": "https://github.com/R-Lum/rxylib", "issueTracker": "https://github.com/R-Lum/rxylib/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "0.2.12.9000.17", + "version": "0.2.12", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R Under development (unstable) (2023-07-21 r84719)", + "runtimePlatform": "R Under development (unstable) (2023-10-30 r85440)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -115,7 +115,8 @@ }, "SystemRequirements": "\n C++17" }, - "fileSize": "3431.963KB", + "fileSize": "3431.965KB", + "releaseNotes": "https://github.com/R-Lum/rxylib/blob/master/NEWS.md", "contIntegration": "https://app.codecov.io/gh/R-Lum/rxylib", "relatedLink": "https://CRAN.R-project.org/package=rxylib" } diff --git a/man/convert_xy2TKA.Rd b/man/convert_xy2TKA.Rd index 0468623..be33023 100644 --- a/man/convert_xy2TKA.Rd +++ b/man/convert_xy2TKA.Rd @@ -60,7 +60,7 @@ Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany } \section{How to cite}{ -Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib +Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12. https://github.com/R-Lum/rxylib } \keyword{IO} diff --git a/man/read_xyData.Rd b/man/read_xyData.Rd index 89a28b0..49446ac 100644 --- a/man/read_xyData.Rd +++ b/man/read_xyData.Rd @@ -62,7 +62,7 @@ University of Bayreuth (Germany) } \section{How to cite}{ -Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib +Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12. https://github.com/R-Lum/rxylib } \keyword{IO} diff --git a/rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-17.WARNING b/rxylib.BuildResults/rxylib-Ex.timings.0.2.12.WARNING similarity index 100% rename from rxylib.BuildResults/rxylib-Ex.timings.0.2.12.9000-17.WARNING rename to rxylib.BuildResults/rxylib-Ex.timings.0.2.12.WARNING diff --git a/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-17.pdf b/rxylib.BuildResults/rxylib-TimingExamples.0.2.12.pdf similarity index 84% rename from rxylib.BuildResults/rxylib-TimingExamples.0.2.12.9000-17.pdf rename to rxylib.BuildResults/rxylib-TimingExamples.0.2.12.pdf index 239beaee86a72c8a1d3bdbd86ef5296d2dd0add4..32a74cc1749357850bf23b2ee13570f7726c9ed1 100644 GIT binary patch delta 602 zcmdm~yi0k4shXjofw7^fk%6J1CYQc%eu_(CNveW|i!Sx>B zjPEa=r*etKTj9px{x@;Qet&ztoHggR&%$)>mv{1BE7okEv>}M=Qf2A)rNWUvX0A0~ z@W4(16J6Das`&tGtp)2YTeZrXFW(yI85+WihVQh%gATuPf?dg>SV%GJ7;)z$Z%xtCnj zbBt-XjODZV^Rt3^k1t=d{g#+&QgUp)=j_L*1Y^lRS< z`=Zp7e3w}#bG<0N<5pQwk$KwPV%pn{@p*Uimhq{2e$qRsyME{7E$eoleNk-^+3oqU zcGbS=XEQ#=)F=KAb-Jfu9CF~(qq_|J469dH^v9HlA3oAjDe;)uha<}PS(*xufuh7y z!ygk34osP#&GXCWMWWLV1KW3sihCBGTE6~f)R&;ma=G=VvtGF^Uz);XH9JE+`pMK+ zms-sHx76&urr~zF^V(iV?RpWuPP04fQlAGdo#&}Kmp9XLg~sui+P{MY-3B?FSlyC^UZVS0Xpl& z9e-ub>oA>}*RQ$YdZFaghYy$P%0GF$}grl_3Ut+Ku5ncpR=D|dd&`Cdy3 zs+qs)eX4PkO?dr{`l%DlPw7TmuyzlRi73&RcV{yJgdCmL*^du zoPV_^EmP<`Kh?k??cFS`X@_dRNtZ6tN!zT;JeSwb$Wp-o1QhZVxWEhp14~0AbTLB% pV^d5qGmFU_g4UYG=rSe-Mg|yShKA;oa|B&E4K2A;RbBnvxB%mZ^?U#T diff --git a/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv b/rxylib.BuildResults/rxylib_0.2.12-Functions.csv similarity index 93% rename from rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv rename to rxylib.BuildResults/rxylib_0.2.12-Functions.csv index 939e884..c32c0bd 100644 --- a/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.csv +++ b/rxylib.BuildResults/rxylib_0.2.12-Functions.csv @@ -1,8 +1,8 @@ "Name","Title","Description","Version","m.Date","m.Time","Author","Citation" "convert_xy2TKA","Convert xy-data to TKA","Convert data to the Toolkit file format (TKA) as exported by, e.g., by the software Canberra Genie 2000.","0.1.1 -",NA,NA,"Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany
","Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib +",NA,NA,"Sebastian Kreutzer, Institute of Geography, Universität Heidelberg, Germany
","Kreutzer, S., 2023. convert_xy2TKA(): Convert xy-data to TKA. Function version 0.1.1. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12. https://github.com/R-Lum/rxylib " "methods_rxylib","methods_rxylib","S3-methods support by the package rxylib . Listed functions can be passed directly into S3 generics (e.g., plot , print ) without reshaping the data.",NA,NA,NA,NA,NA "read_xyData","Import xy-Data for Supported Formats into R","The function provides access to the underlying xylib to import data for supported file formats into R. In most cases, only the file path is needed with further arguments to import the data. The function automatically recognises allowed formats. See rxylib-package for supported formats.","0.3.0 -",NA,NA,"Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,
University of Bayreuth (Germany)
","Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12.9000-17. https://github.com/R-Lum/rxylib +",NA,NA,"Sebastian Kreutzer, Institute of Geography, Ruprecht-Karl-University of Heidelberg (Germany), Johannes Friedrich,
University of Bayreuth (Germany)
","Kreutzer, S., Friedrich, J., 2023. read_xyData(): Import xy-Data for Supported Formats into R. Function version 0.3.0. In: Kreutzer, S., Friedrich, J., 2023. rxylib: Import XY-Data into R . R package version 0.2.12. https://github.com/R-Lum/rxylib " diff --git a/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html b/rxylib.BuildResults/rxylib_0.2.12-Functions.html similarity index 94% rename from rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html rename to rxylib.BuildResults/rxylib_0.2.12-Functions.html index 896f1f1..5ba0908 100644 --- a/rxylib.BuildResults/rxylib_0.2.12.9000-17-Functions.html +++ b/rxylib.BuildResults/rxylib_0.2.12-Functions.html @@ -1,6 +1,6 @@

Major functions in the R package 'Luminescence'

-

[version: 0.2.12.9000-17 ]

+

[version: 0.2.12 ]