Skip to content

Commit 97c9ae2

Browse files
committed
Merge branch 'staging'
2 parents fc58af1 + 4b6e345 commit 97c9ae2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+39916
-3577
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install
2828
run: |
2929
( cd libcdf && make build && sudo make install )
30-
( cd qdipole && ./configure && make build && sudo make install )
30+
( cd qdipole && ./configure && make build && sudo make install && make test )
3131
pip3 install --upgrade pip
3232
pip3 install wheel
3333
pip3 install scipy

eoxmagmod/MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ recursive-exclude eoxmagmod *.pyc *.o
33
recursive-include eoxmagmod *.c *.h
44
recursive-include eoxmagmod/data *.txt *.shc *.cof *.COF
55
recursive-include eoxmagmod/tests/data *.txt *.tsv
6-
recursive-include eoxmagmod/magnetic_models/tests/data *.txt *.cdf
6+
recursive-include eoxmagmod/magnetic_model/tests/data *.txt *.cdf

eoxmagmod/eoxmagmod/__init__.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Author: Martin Paces <[email protected]>
66
#
77
#-------------------------------------------------------------------------------
8-
# Copyright (C) 2014-2022 EOX IT Services GmbH
8+
# Copyright (C) 2014-2024 EOX IT Services GmbH
99
#
1010
# Permission is hereby granted, free of charge, to any person obtaining a copy
1111
# of this software and associated documentation files (the "Software"), to deal
@@ -60,6 +60,7 @@
6060
from .quasi_dipole_coordinates import (
6161
eval_qdlatlon, eval_mlt, eval_subsol,
6262
eval_qdlatlon_with_base_vectors,
63+
QDIPOLE_VERSION,
6364
)
6465
from .solar_position import sunpos, sunpos_original
6566
from .dipole_coords import (
@@ -115,6 +116,7 @@
115116
'eval_qdlatlon_with_base_vectors',
116117
'eval_mlt',
117118
'eval_subsol',
119+
'QDIPOLE_VERSION',
118120
'sunpos',
119121
'sunpos_original',
120122
'decimal_year_to_mjd2000',
@@ -140,7 +142,7 @@
140142
except ImportError:
141143
pass
142144

143-
__version__ = '0.12.1'
145+
__version__ = '0.14.0'
144146
__author__ = 'Martin Paces ([email protected])'
145-
__copyright__ = 'Copyright (C) 2014-2022 EOX IT Services GmbH'
147+
__copyright__ = 'Copyright (C) 2014-2024 EOX IT Services GmbH'
146148
__licence__ = 'EOX licence (MIT style)'

eoxmagmod/eoxmagmod/data/CHAOS-7.18_core.shc

+445
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)