Skip to content

Commit e1a6f22

Browse files
authored
Merge pull request #96 from ropensci/no-useBytes
* Remove useBytes for grep/gsub * Fix unit tests by removing latin1 chars from RJC.bib test file * Import bibtex again
2 parents 3b30bc6 + 692a420 commit e1a6f22

23 files changed

+259
-256
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
on:
4-
push:
5-
branches: [main, master]
6-
pull_request:
7-
branches: [main, master]
3+
on: push
84

95
name: R-CMD-check
106

@@ -31,23 +27,38 @@ jobs:
3127
steps:
3228
- uses: actions/checkout@v2
3329

34-
- uses: r-lib/actions/setup-pandoc@v1
30+
- uses: r-lib/actions/setup-pandoc@v2
3531

3632
- uses: r-lib/actions/setup-tinytex@master
3733

3834
- run: tlmgr install pdfpages ae pdflscape
3935

40-
- uses: r-lib/actions/setup-r@v1
36+
- uses: r-lib/actions/setup-r@v2
4137
with:
4238
r-version: ${{ matrix.config.r }}
4339
http-user-agent: ${{ matrix.config.http-user-agent }}
4440
use-public-rspm: true
4541

46-
- uses: r-lib/actions/setup-r-dependencies@v1
42+
- uses: r-lib/actions/setup-r-dependencies@v2
4743
with:
4844
extra-packages: rcmdcheck
4945

50-
- uses: r-lib/actions/check-r-package@v1
46+
- run: sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes ghostscript
47+
if: runner.os == 'Linux'
48+
49+
- run: choco install ghostscript --no-progress
50+
if: runner.os == 'Windows'
51+
- shell: bash
52+
run: |
53+
echo "C:/Program Files (x86)/gs/gs9.53.3/bin/" >> $GITHUB_PATH
54+
echo "C:/Program Files/gs/gs9.53.3/bin/" >> $GITHUB_PATH
55+
export PATH="/c/Program Files (x86)/gs/gs9.53.3/bin/:$PATH"
56+
export PATH="/c/Program Files/gs/gs9.53.3/bin/:$PATH"
57+
if: matrix.config.os == 'windows-latest'
58+
59+
- uses: r-lib/actions/check-r-package@v2
60+
with:
61+
build_args: 'c("--compact-vignettes=both")'
5162

5263
- name: Show testthat output
5364
if: always()

DESCRIPTION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: RefManageR
2-
Version: 1.3.5
2+
Version: 1.4.0
33
Title: Straightforward 'BibTeX' and 'BibLaTeX' Bibliography Management
44
Authors@R: person(c("Mathew", "W."), "McLean", role = c("aut", "cre"),
55
email = "[email protected]",
@@ -27,16 +27,16 @@ Imports:
2727
httr,
2828
lubridate (>= 1.5.0),
2929
stringr,
30-
methods
30+
methods,
31+
bibtex (>= 0.4.1)
3132
Suggests:
3233
knitr,
3334
markdown,
34-
testthat,
35-
bibtex (>= 0.4.1)
35+
testthat
3636
Encoding: UTF-8
3737
Depends:
3838
R (>= 3.0)
3939
VignetteBuilder: knitr
4040
BugReports: https://github.com/ropensci/RefManageR/issues
4141
URL: https://github.com/ropensci/RefManageR/
42-
RoxygenNote: 7.1.2
42+
RoxygenNote: 7.2.1

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ export(as.BibEntry)
4949
export(fields)
5050
export(is.BibEntry)
5151
export(toBiblatex)
52+
importFrom(bibtex,do_read_bib)
5253
importFrom(httr,GET)
5354
importFrom(httr,POST)
5455
importFrom(httr,add_headers)
5556
importFrom(httr,content)
57+
importFrom(httr,http_condition)
5658
importFrom(httr,http_error)
5759
importFrom(httr,modify_url)
5860
importFrom(httr,status_code)

0 commit comments

Comments
 (0)