Skip to content

MRG, FIX: Datetime call in gdf 2.x age calculation #7581

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.

Sign up for GitHub

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

Merged
larsoner merged 2 commits into from
Apr 9, 2020
Merged

MRG, FIX: Datetime call in gdf 2.x age calculation #7581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecfb623
FIX: Datetime call in gdf 2.x age calculation
SveaMeyer13 Apr 8, 2020
8101b1c
DOC: Update latest and names
SveaMeyer13 Apr 9, 2020
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
4 changes: 4 additions & 0 deletions doc/changes/latest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Bug

- Fix bug that prevents ``n_jobs`` from being a NumPy integer type, by `Daniel McCloy`_.

- Fix bug with :func:`mne.io.read_raw_gdf` where birthdays were not parsed properly, leading to an error by `Svea Marie Meyer`_



API
~~~

Expand Down
4 changes: 3 additions & 1 deletion doc/changes/names.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,6 @@

.. _Adam Li: http://github.com/adam2392

.. _Ramiro Gatti: https://github.com/ragatti
.. _Ramiro Gatti: https://github.com/ragatti

.. _Svea Marie Meyer: https://github.com/SveaMeyer13
Copy link
Member

@larsoner larsoner Apr 9, 2020

Choose a reason for hiding this comment

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

Name here and above need to match, it's what CircleCI complains about (search "warning" in the log and you'll see it)

https://app.circleci.com/pipelines/github/mne-tools/mne-python/897/workflows/179f9067-911b-4472-b7eb-20702ffa91f8/jobs/19252

And the broken link is visible here

https://19252-1301584-gh.circle-artifacts.com/0/dev/whats_new.html

4 changes: 2 additions & 2 deletions mne/io/edf/edf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,12 +857,12 @@ def _read_gdf_header(fname, exclude):
if birthday == 0:
birthday = datetime(1, 1, 1, tzinfo=timezone.utc)
else:
birthday = (datetime(1, 1, 1) +
birthday = (datetime(1, 1, 1, tzinfo=timezone.utc) +
timedelta(birthday * pow(2, -32) - 367))
patient['birthday'] = birthday
if patient['birthday'] != datetime(1, 1, 1, 0, 0,
tzinfo=timezone.utc):
today = datetime.today(tzinfo=timezone.utc)
today = datetime.now(tz=timezone.utc)
patient['age'] = today.year - patient['birthday'].year
today = today.replace(year=patient['birthday'].year)
if today < patient['birthday']:
Expand Down