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

PR: "colour.SpectralDistribution_IESTM2714.read" method should probably return "self". #513

Conversation

@BPearlstine
Copy link
Contributor

commented Oct 1, 2019

refs ticket #506

changed the colour.SpectralDistribution_IESTM2714.read method to return self instead of True, updated instances of this call to match syntax in ticket.

domoritz and others added 2 commits Jul 30, 2019
The examples are nx3, not 3xn
PR: Update docstrings in "correction.py" module.
@KelSolaar

This comment has been minimized.

Copy link
Member

commented Oct 1, 2019

Hi @BPearlstine,

Did you start from the develop branch? It seems like this is stemming from master.

Cheers,

Thomas

@KelSolaar KelSolaar added this to the v0.3.14 milestone Oct 1, 2019
@BPearlstine

This comment has been minimized.

Copy link
Contributor Author

commented Oct 1, 2019

Hi @BPearlstine,

Did you start from the develop branch? It seems like this is stemming from master.

Cheers,

Thomas

@KelSolaar

I attempted to follow your docs on contributing as closely as I could, I may have made a mistake where it mentioned pulling in upstream master?

@KelSolaar

This comment has been minimized.

Copy link
Member

commented Oct 2, 2019

Ah damn, my fault!

I will update the guide, this is a total oversight and it should be indeed develop, i.e. the repo default branch.

Do you think you could apply your changes on top of develop and force-push into your current branch? It should just be a matter of issuing git rebase develop, here is a guide: https://medium.com/@gabriellamedas/git-rebase-and-git-rebase-onto-a6a3f83f9cce

@BPearlstine

This comment has been minimized.

Copy link
Contributor Author

commented Oct 2, 2019

Ah damn, my fault!

I will update the guide, this is a total oversight and it should be indeed develop, i.e. the repo default branch.

Do you think you could apply your changes on top of develop and force-push into your current branch? It should just be a matter of issuing git rebase develop, here is a guide: https://medium.com/@gabriellamedas/git-rebase-and-git-rebase-onto-a6a3f83f9cce

@KelSolaar
I'll get that pushed up this evening.

@BPearlstine BPearlstine force-pushed the BPearlstine:feature/spectralDistribution-read-return-self-506 branch from 7da48d8 to 095a511 Oct 3, 2019
os.path.join(RESOURCES_DIRECTORY, 'Fluorescent.spdx'))

sd_r.read()
os.path.join(RESOURCES_DIRECTORY, 'Fluorescent.spdx')).read()

sd_r.path = os.path.join(self._temporary_directory, 'Fluorescent.spdx')
self.assertTrue(sd_r.write())

This comment has been minimized.

Copy link
@KelSolaar

KelSolaar Oct 4, 2019

Member

@BPearlstine : I think you need to modify the next line to sd_t = SpectralDistribution_IESTM2714(sd_r.path).read() and you are good! 👍

@KelSolaar

This comment has been minimized.

Copy link
Member

commented Oct 4, 2019

Looks like it worked @BPearlstine ! 👍

@KelSolaar KelSolaar changed the title Feature/spectral distribution read return self 506 PR: "colour.SpectralDistribution_IESTM2714.read" method should probably return "self". Oct 4, 2019
@KelSolaar KelSolaar merged commit 85ff2b0 into colour-science:develop Oct 4, 2019
10 checks passed
10 checks passed
Unix Build (ubuntu-18.04, 2.7)
Details
Unix Build (ubuntu-18.04, 3.6)
Details
Unix Build (ubuntu-18.04, 3.7)
Details
Unix Build (macOS-10.14, 2.7)
Details
Unix Build (macOS-10.14, 3.6)
Details
Unix Build (macOS-10.14, 3.7)
Details
Windows Build (windows-2019, 2.7)
Details
Windows Build (windows-2019, 3.6)
Details
Windows Build (windows-2019, 3.7)
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.