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.

Sign up for GitHub

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

Jump to bottom

Clean depracated functions and unit tests #331

Merged
merged 33 commits into from
Jul 12, 2021
Merged

Clean depracated functions and unit tests #331

merged 33 commits into from
Jul 12, 2021

Conversation

GegznaV
Copy link
Collaborator

@GegznaV GegznaV commented Jul 10, 2021 •
edited
Loading

I create this PR of the @cbeleites branch so that we could discuss the changes made.

Closes #326
Related to #330, r-hyperspec/r-hyperspec.github.io#17

In addition to updates by @cbeleites, I:

  • fixed some lines of code to pass R CMD check,
  • updated several more unit tests to avoid warnings due to deprecation messages,
  • updated the style in some functions (did it here as I wanted to avoid conflicts with other PRs by me).

cbeleites and others added 14 commits May 31, 2021 20:50
@cbeleites
include deprecated.R in Collate: order
b174ff3
@cbeleites
fix deprecated function unit test
611513d 
unit test should only check for deprecation message
@cbeleites
fix deprecated function unit test
a49a8d0 
unit test should only check for deprecation message
@cbeleites
fix deprecation
ee14e8d
@cbeleites
fix deprecation
e15f966
@cbeleites
fix deprecation
0847d8d
@cbeleites
fix merge
bdaa1d0 
Merge branch 'bugfix/321-unit-tests-failing-R-release' of github.com:cbeleites/hyperSpec into bugfix/321-unit-tests-failing-R-release

# Conflicts:
#	hyperSpec/R/DEPRECATED-read.txt.Witec.R
@cbeleites
deprecation: fix parameters for calling new version
ca2dee1
@cbeleites
fix deprecation
8d6840a
@cbeleites
fix deprecation
14b28f1
@cbeleites
merge develop into bugfix/321-unit-tests-failing-R-release
f89bb24 
Merge branch 'develop' into bugfix/321-unit-tests-failing-R-release

# Conflicts:
#	hyperSpec/R/DEPRECATED-spc_fit_poly.R
#	hyperSpec/R/DEPRECATED-spc_rubberband.R
@cbeleites
deprecate read.jdx()
d95ac46
@cbeleites
fix collate order for wl_eval()
ce106f2
@GegznaV
Merge branch 'develop' into bugfix/321-unit-tests-failing-R-release
73ff749
@GegznaV
Copy link
Collaborator Author

GegznaV commented Jul 10, 2021

I added some commits to this PR that are related to #330 (style of function description titles).

@GegznaV
Copy link
Collaborator Author

GegznaV commented Jul 11, 2021

After updates in unit tests, there are no warnings related to the function deprecation:
image

So I think this PR is ready to be merged. And if some new improvements are needed, they can be added as a new PR.
What do you think @cbeleites?

@GegznaV GegznaV marked this pull request as ready for review July 11, 2021 00:24
GegznaV added 3 commits July 11, 2021 03:43
@GegznaV
Deprecate .read.spe.xml
80f26e4
@GegznaV
Update contents of pkgdown website
e089843
@GegznaV
Updating from develop manually again
922e173 
...in order not to lose changes due to error that occurred while updating from  `develop` previously.
@GegznaV GegznaV mentioned this pull request Jul 12, 2021
Open
cbeleites
cbeleites approved these changes Jul 12, 2021
View reviewed changes
Copy link
Owner

@cbeleites cbeleites left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an intermediate stage of deprecating lots of functions, a) to rename or b) to move them into separate packages. Work is not complete, but it's time to merge this into develop to avoid parallel development.

@cbeleites cbeleites merged commit a5eee67 into develop Jul 12, 2021
@cbeleites cbeleites deleted the bugfix/321-unit-tests-failing-R-release branch July 12, 2021 13:06
@GegznaV
Copy link
Collaborator Author

GegznaV commented Jul 12, 2021

Thanks for merging, @cbeleites

@GegznaV GegznaV mentioned this pull request Jul 12, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbeleites cbeleites cbeleites approved these changes

Assignees
No one assigned
Labels
Topic: deprecate/defunct :neckbeard:
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Functions moved to hySpc.read.jdx
2 participants
@GegznaV @cbeleites