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

fix for issue #1228 #1236

Closed
wants to merge 15 commits into from
Closed

fix for issue #1228 #1236

wants to merge 15 commits into from

Conversation

ebjordi
Copy link
Contributor

@ebjordi ebjordi commented Jul 14, 2020

Description

  • Modified function Radial1DModel.from_csvy() so the dataframes are read appropriately, and that the first is removed only when it's being read from a csv table.

Motivation and Context

See #1235 and #1228 for context

How Has This Been Tested?

pytest passes for all test in the folder.
xfail tests will be added in the next PR of the project

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Add new tests

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have assigned/requested two reviewers for this pull request.

@codecov
Copy link

codecov bot commented Jul 14, 2020

Codecov Report

Merging #1236 into master will decrease coverage by 0.06%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1236      +/-   ##
==========================================
- Coverage   80.63%   80.57%   -0.07%     
==========================================
  Files          41       41              
  Lines        3424     3428       +4     
==========================================
+ Hits         2761     2762       +1     
- Misses        663      666       +3     
Impacted Files Coverage Δ
tardis/model/base.py 88.29% <100.00%> (-0.92%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd35df9...b73d4a8. Read the comment docs.

@ebjordi ebjordi linked an issue Jul 14, 2020 that may be closed by this pull request
@ebjordi
Copy link
Contributor Author

ebjordi commented Jul 16, 2020

Up to here, all test passed locally

@ebjordi
Copy link
Contributor Author

ebjordi commented Jul 16, 2020

Should I move the compare test to it's own file?

@ebjordi
Copy link
Contributor Author

ebjordi commented Jul 16, 2020

This is ready to merge

ebjordi and others added 13 commits July 17, 2020 12:34
* Added roadmap link to main page

* Added roadmap page

Co-authored-by: Marc Williamson <marcwilliamson@Marcs-MacBook-Pro.local>
* Update team.rst - Add roles and descriptions

Added roles and descriptions to the team page

* Update team.rst - Added new GSoC students

Update GSoC students section

* Update team.rst - Added new roles

Added new roles and minor style changes

* add several nbsphinx related options

* restructure the Governance model page

* re-enabled nbsphinx

* fix issues marked by @yssa

Co-authored-by: Yssa Camacho <yssavo.camacho@gmail.com>
* Update team.rst - Add roles and descriptions

Added roles and descriptions to the team page

* Update team.rst - Added new GSoC students

Update GSoC students section

* Update team.rst - Added new roles

Added new roles and minor style changes

* add several nbsphinx related options

* restructure the Governance model page

* re-enabled nbsphinx

* add adapted CoC

* ammending code of conduct in the root

* add code of conduct

* getting upstream/master team.rst

Co-authored-by: Yssa Camacho <yssavo.camacho@gmail.com>
* add code_of_conduct_symlink

* add code of conduct link
* Added new contributing guidelines

* Added symlink of Contributing.md to Contribting to TARDIS section

* Fixed sym link

* Update CONTRIBUTING.md

Co-authored-by: Wolfgang Kerzendorf <wkerzendorf@gmail.com>

* Update CONTRIBUTING.md

Co-authored-by: Wolfgang Kerzendorf <wkerzendorf@gmail.com>

Co-authored-by: Marc Williamson <marxwillia@gmail.com>
Co-authored-by: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
@ebjordi ebjordi closed this Jul 17, 2020
@ebjordi ebjordi deleted the csfy-fix branch July 27, 2020 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Radial1DModel.from_csvy() returns wrong abundances
4 participants