Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #260

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3599080
Bump version number (1.0.0.9000)
dfalster May 6, 2024
6acbeac
spelling fixes and removing special Mac install instructions (#229)
wcornwell May 29, 2024
c95ddb6
Cran preparations (#230)
fontikar May 30, 2024
8b7a619
cleaning up (#231)
wcornwell Jun 16, 2024
94254aa
fixing badges
wcornwell Jun 17, 2024
608aab2
Merge branch 'master' into develop
wcornwell Jun 17, 2024
d4f2379
Tweaks (#234)
slager Jun 20, 2024
379ca6b
testing for issue #235
wcornwell Jul 31, 2024
48567b4
still working on #235
wcornwell Jul 31, 2024
3798dcc
one more try to find the edge case
wcornwell Jul 31, 2024
ec50f22
another edge case?
wcornwell Jul 31, 2024
6e8a768
reformat code in release file
wcornwell Jul 31, 2024
724b6c9
another edge case
wcornwell Jul 31, 2024
98d8921
reverting previous commit to documentation
wcornwell Jul 31, 2024
a99fc67
adding check on resources to all functions that need resources
wcornwell Jul 31, 2024
adfee1c
bumping version number and updating readme
wcornwell Jul 31, 2024
281fbe5
missed two checking spots
wcornwell Jul 31, 2024
5102771
238 genus family lookup (#239)
wcornwell Aug 13, 2024
c4fa44d
bumping version number and updating news
wcornwell Aug 13, 2024
4ea4068
update readme
wcornwell Aug 13, 2024
3e637e6
Merge branch 'master' into develop
wcornwell Aug 13, 2024
238bda6
no empty lines in description
wcornwell Aug 13, 2024
64b386a
trying to atone for previous git sins
wcornwell Aug 28, 2024
c78090a
Merged in recent master release, bumped version number
fontikar Nov 19, 2024
594b28c
Updating develop branch with CRAN fixes #249
fontikar Dec 20, 2024
cfb584b
Merge branch 'master' into develop
fontikar Jan 16, 2025
6a8d9e0
Following tip to change the testing state #253
fontikar Jan 27, 2025
084ab1b
Merge branch 'master' into develop #253
fontikar Jan 27, 2025
58aa4b9
Added comment about changing CPU state
fontikar Jan 27, 2025
f74cde2
Removed dev version number
fontikar Jan 27, 2025
0731cc5
Updated R version dependency
fontikar Jan 28, 2025
b9e27ff
257 internet up but GitHub unresponsive case only 98 gracefull (#259)
wcornwell Feb 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.1.2
Date: 2025-01-13 00:32:56 UTC
SHA: 7f8e98fe2a02afc75badcfeef54dfc901f690fe5
Date: 2025-01-28 03:02:05 UTC
SHA: f91fc2ec56112621d5517558a7df6f968e65195c
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Encoding: UTF-8
Language: en
LazyData: true
Depends:
R (>= 4.0.0),
R (>= 4.1.0),
Imports:
readr,
purrr,
Expand Down
5 changes: 3 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

* This is a resubmission
* Improved handling for release tag versions from Github API
* Adding one user function for genus->family lookup

* Getting CPU elapsed limit for Debian but no parallelisation used in package
* Have set CPU thread limit manually for tests
* Updated R dependency
3 changes: 3 additions & 0 deletions tests/testthat.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# * https://r-pkgs.org/tests.html
# * https://testthat.r-lib.org/reference/test_package.html#special-files

# Setting the CPU Thread limit to max 2 to meet CRAN guidelines.
Sys.setenv("OMP_THREAD_LIMIT" = 2)

library(testthat)
library(APCalign)

Expand Down
1 change: 0 additions & 1 deletion tests/testthat/test-versions.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ test_that("Retrieval is possible", {
versions <- get_versions()

expect_visible(versions)
expect_named(versions)
})

Loading