Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,14 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install POSYDON without extras
- name: Install POSYDON with test dependencies
run: |
python -m pip install --upgrade pip
pip install .
pip install .[test]

- name: Run all tests in posydon/unit_tests
run: |
# python -m pip install --upgrade pip
# pip install .
pip install pytest
pip install pytest-cov
export PATH_TO_POSYDON=./
export PATH_TO_POSYDON_DATA=./posydon/unit_tests/_data/
export MESA_DIR=./
python -m pytest posydon/unit_tests/ \
--cov=posydon.config \
--cov=posydon.utils \
--cov=posydon.grids \
--cov=posydon.popsyn.IMFs \
--cov=posydon.popsyn.norm_pop \
--cov=posydon.popsyn.distributions \
--cov=posydon.popsyn.star_formation_history \
--cov=posydon.CLI \
--cov-branch \
--cov-report term-missing \
--cov-fail-under=100
pytest # run and coverage parameters are defined in pyproject.toml
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "grid_params/POSYDON-MESA-INLISTS"]
path = grid_params/POSYDON-MESA-INLISTS
url = https://github.com/POSYDON-code/POSYDON-MESA-INLISTS.git
[submodule "data/POSYDON_data"]
path = data/POSYDON_data
url = https://github.com/POSYDON-code/POSYDON_data.git
[submodule "posydon/tests/data/POSYDON-UNIT-TESTS"]
path = posydon/tests/data/POSYDON-UNIT-TESTS
url = https://github.com/POSYDON-code/POSYDON-UNIT-TESTS.git
6 changes: 3 additions & 3 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{% set name = "posydon" %}
{% set version = "2.2.6" %}

package:
name: "{{ name|lower }}"
version: "{{ version }}"
version: {{ GIT_DESCRIBE_TAG }}
Copy link
Contributor

@sgossage sgossage Feb 23, 2026

Choose a reason for hiding this comment

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

Should we revert to the old version: "{{ version }}"?

Otherwise I think we can test if this works for us with a release after merging.

Copy link
Contributor

@sgossage sgossage Feb 23, 2026

Choose a reason for hiding this comment

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

Things seem to be working well. In my local test of publish_conda, the tag v2.2.4 gets picked up, I think because that is the latest tag this branch can grab.

Copy link
Contributor

Choose a reason for hiding this comment

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

minor stylistic suggestion: leave the quotes on

version: "{{ GIT_DESCRIBE_TAG }}"


source:
path: ..
Expand All @@ -17,7 +16,8 @@ requirements:
host:
- pip
- python==3.11
- setuptools>=38.2.5
- setuptools>=76.0.0
- setuptools-scm>=8.0

run:
- python==3.11
Expand Down
1 change: 0 additions & 1 deletion data/POSYDON_data
Submodule POSYDON_data deleted from e5d8d7
11 changes: 7 additions & 4 deletions posydon/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from ._version import get_versions
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = version("posydon")
except PackageNotFoundError:
# Package is not installed
__version__ = "unknown"

__version__ = get_versions()['version']
__author__ = "Tassos Fragos <Anastasios.Fragkos@unige.ch>"
__credits__ = [
"Emmanouil Zapartas <ezapartas@gmail.com>",
Expand All @@ -19,5 +24,3 @@
"Ying Qin <<yingqin2013@hotmail.com>",
"Aaron Dotter <aaron.dotter@gmail.com>",
]

del get_versions
Loading