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

Metisse integrate kb #674

Merged

Conversation

katiebreivik
Copy link
Collaborator

bringing METISS-integrate up to date with develop

MarkGM02 and others added 30 commits June 21, 2024 16:54
* added offner22 primary mass dependent binary fraction

* pinning numpy version because of new numpy version released on june 16 (https://stackoverflow.com/questions/78634235/numpy-dtype-size-changed-may-indicate-binary-incompatibility-expected-96-from)

* pinned numpy version so 3.7 works

---------

Co-authored-by: katiebreivik <kbreivik@flatironinstitute.org>
* Update utils.py

fix trapezoid import

* Update utils.py

missed one trapz
* version bump and dropping below python3.9

* forward to numpy 1.26.0

* trying a different version

* fix trapz import
explicitly install gcc
trying to fix gfortran
specifying path with symlink, checking path
* Update build_wheels_and_publish.yml

* Update _version.py

* Update meson.build
* Update meson.build

* Update _version.py
…h#651)

* add `q_power_law` parameter to change the power law of the mass ratio distribution

* allow custom power laws for orbital periods

* add mass ratio sampling test

* add test for custom porb power laws

* add to changelog
* add new gamma prescription, add some int() statements

* add  details to docs page

* update ini files
…h#659)

*Created get_commit_hash file that finds the commit hash.

*Modified the meson.build file to run get_commit_hash when cosmic is installed.
* Added compression options for pandas

* Created maximum wall time argument
)

* setup debugging environment

* ignore a bunch of files

* add a testing fortran script

* move debugging to its own folder

* add a python script for creating the input

* add a simple makefile for testing

* important change: use `loop` instead of `1000` for timestep condition

* add a note about settings

* clean up vscode setup

* I can't count 🙃

* added new test suite location

* fixing numpy pinned version

* forcing numpy version I guess

---------

Co-authored-by: katiebreivik <kbreivik@flatironinstitute.org>
Co-authored-by: Katie Breivik <kbreivik@andrew.cmu.edu>
* Update _version.py

* Update pyproject.toml

add @TomWagg as dev

* Update meson.build

bump version
removing gfortran symlink
* Update build_wheels_and_publish.yml

* this should be a working build.
* Update build_wheels_and_publish.yml

* adding in python versions

* Update build_wheels_and_publish.yml

* Update meson.build

* Update meson.build

* Update pyproject.toml
* add DS_Store to ignore

* finalllllly got the platform specific wheels built with a pure: false

* tiny bump in version for tag
need to repair linux build with cibuildwheel for PyPI
forgot to bump version here
* pins cibuildwheel==2.17.0 so that we can build across macOS versions.
* allow push to pypi
* Update build_wheels_and_publish.yml

* Update build_wheels_and_publish.yml

* Update meson.build version

* Update _version.py version

* Update pyproject.toml version
…OSMIC-PopSynth#672)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@katiebreivik katiebreivik merged commit 2159a11 into COSMIC-PopSynth:METISSE-integrate Sep 11, 2024
2 checks passed
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.

5 participants