Skip to content

Commit

Permalink
updated to CRAN version 1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mlampros committed Dec 5, 2023
1 parent 6e38cff commit 57b2581
Show file tree
Hide file tree
Showing 28 changed files with 479 additions and 399 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@

#..........................................................................................................
# build, push and cache the docker image. I have to adjust the following in case of a different repository:
# - I have to add the 'BUILD_DATE' arg in the Dockerfile
# - I have to create a DOCKER_PASSWORD (use the docker token) in the 'Settings' tab of the repository
# References:
# - https://github.com/mlampros/IceSat2R/blob/master/.github/workflows/docker_image.yml
# - https://github.com/orgs/community/discussions/25768#discussioncomment-3249184
#..........................................................................................................

on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: docker_img

jobs:
build:
runs-on: ubuntu-latest

steps:
- id: string
uses: ASzc/change-string-case-action@v1
with:
string: ${{ github.event.repository.name }}

- name: Check Out Repo
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ github.repository_owner }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build and push
uses: docker/build-push-action@v2
with:
context: ./
build-args: BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
file: ./Dockerfile
builder: ${{ steps.buildx.outputs.name }}
push: true
tags: ${{ github.repository_owner }}/${{ steps.string.outputs.lowercase }}:rstudiodev
cache-from: type=registry,ref=${{ github.repository_owner }}/${{ steps.string.outputs.lowercase }}:buildcache
cache-to: type=registry,ref=${{ github.repository_owner }}/${{ steps.string.outputs.lowercase }}:buildcache,mode=max
6 changes: 3 additions & 3 deletions .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ignore-comments: true
labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help"]}'
labels-not-allowed: '["good first issue"]'
default-labels: '["help wanted"]'
labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help","how can i"]}'
labels-not-allowed: '["documentation","duplicate","good first issue","help wanted","invalid"]'
default-labels: '["triage"]'
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: textTinyR
Type: Package
Title: Text Processing for Small or Big Data Files
Version: 1.1.7
Date: 2021-10-29
Version: 1.1.8
Date: 2023-12-04
Authors@R: c( person(given = "Lampros", family = "Mouselimis", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "https://orcid.org/0000-0002-8024-1546")))
BugReports: https://github.com/mlampros/textTinyR/issues
URL: https://github.com/mlampros/textTinyR
Expand All @@ -16,6 +16,6 @@ Imports: Rcpp (>= 0.12.10), R6, data.table, utils
LinkingTo: Rcpp, RcppArmadillo (>= 0.7.8), BH
Suggests: testthat, covr, knitr, rmarkdown
VignetteBuilder: knitr
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
NeedsCompilation: yes
Packaged: 2017-04-01 13:56:22 UTC; lampros
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM rocker/rstudio:devel


LABEL maintainer='Lampros Mouselimis'


RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && \
apt-get install -y zlib1g-dev git-core pandoc pandoc-citeproc libcurl4-openssl-dev libssl-dev && \
apt-get install -y sudo && \
apt-get install -y libarmadillo-dev && \
R -e "install.packages(c( 'Rcpp', 'R6', 'data.table', 'utils', 'RcppArmadillo', 'BH', 'testthat', 'covr', 'knitr', 'rmarkdown', 'remotes' ), repos = 'https://cloud.r-project.org/' )" && \
R -e "remotes::install_github('mlampros/textTinyR', upgrade = 'always', dependencies = TRUE, repos = 'https://cloud.r-project.org/')" && \
R -e "install.packages(c( 'Rcpp', 'R6', 'data.table', 'utils', 'RcppArmadillo', 'BH', 'testthat', 'covr', 'knitr', 'rmarkdown', 'remotes' ), repos = 'https://cloud.r-project.org/' )"

ADD http://www.random.org/strings/?num=10&len=8&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new uuid
ARG BUILD_DATE

RUN echo "$BUILD_DATE"
RUN R -e "remotes::install_github('mlampros/textTinyR', upgrade = 'always', dependencies = TRUE, repos = 'https://cloud.r-project.org/')" && \
apt-get autoremove -y && \
apt-get clean


ENV USER rstudio


1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export(Count_Rows)
export(Doc2Vec)
export(JACCARD_DICE)
export(TEXT_DOC_DISSIM)
export(batch_compute)
export(big_tokenize_transform)
export(bytes_converter)
export(cluster_frequency)
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@

## textTinyR 1.1.8

* I've fixed the CRAN *warning: format specifies type 'int' but the argument has type 'long long'* in the following files & lines by replacing the `%3d` expression with `%3lld`:
* ./token_big_files.h:862:60
* ./term_matrix.h:456:75 *and* 647:75
* word_vecs_pointer_embedding.cpp:333:67 *and* 240:68
* I removed the "CXX_STD = CXX11" from the "Makevars" files, and the "[[Rcpp::plugins(cpp11)]]" from the ".cpp" files due to the following NOTE from CRAN, "NOTE Specified C++11: please drop specification unless essential" (see also: https://www.tidyverse.org/blog/2023/03/cran-checks-compiled-code/#note-regarding-systemrequirements-c11)
* I exported the *batch_calculation()* Rcpp function and created the *batch_compute()* R function
* I removed the `-mthreads` compilation option from the "Makevars.win" file


## textTinyR 1.1.7

Expand Down
Loading

0 comments on commit 57b2581

Please sign in to comment.