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

[TEP007] [WIP] Isotope Abundances class #756

Merged
merged 6 commits into from
Jul 4, 2017

Conversation

vg3095
Copy link
Contributor

@vg3095 vg3095 commented Jul 4, 2017

This PR just contains Isotope Abundance class, a simple unit test and changes in tardis environment file.
I am not able to resolve conflict for Mac-OS build for pyne .

  • Current version of pyne is 0.5.3 , but I have used 0.5.0 , as 0.5.3 requires updating almost everything (pandas, numpy, astropy, h5py,etc)
  • I have added cyclus and pyne as channels in tardis_env27.yml as pyne is not available through default channel
  • libgcc was also required for pyne . I have not mentioned version no. for it because in case of Linux 5.2 works , and in case of Mac 4.8 is available. (I will check it one more time). Without updating libgcc in Linux , pyne is not properly imported.
  • Mac OS build has conflict with astropy build, and If I update it , it will result in updating almost all packages as I said in point 1.

I will try to resolve MacOS issue, if anybody as any suggestion, then most welcome.
I have tried various combinations.

@vg3095 vg3095 changed the title [TEP007] Isotope Abundances class [TEP007] [WIP] Isotope Abundances class Jul 4, 2017
tardis_env27.yml Outdated
@@ -14,7 +20,8 @@ dependencies:
- pytest=3.0
- pyyaml=3.12
- jsonschema=2.5.1

- libgcc
Copy link
Member

Choose a reason for hiding this comment

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

can you take this requirement out?

@wkerzendorf
Copy link
Member

@vg3095 please rebase on master

@vg3095 vg3095 force-pushed the radioactive_decay branch from 6835ad3 to b609640 Compare July 4, 2017 09:38
@vg3095
Copy link
Contributor Author

vg3095 commented Jul 4, 2017

@wkerzendorf I have rebased now.

@wkerzendorf wkerzendorf merged commit e0e3c04 into tardis-sn:decay Jul 4, 2017
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.

2 participants