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

switch out xdrlib to mda_xdrlib #4271

Merged
merged 8 commits into from
Aug 31, 2023
Merged
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
3 changes: 3 additions & 0 deletions .github/actions/setup-deps/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ inputs:
default: 'hypothesis'
matplotlib:
default: 'matplotlib-base'
mda_xdrlib:
default: 'mda-xdrlib'
mmtf-python:
default: 'mmtf-python'
networkx:
Expand Down Expand Up @@ -111,6 +113,7 @@ runs:
${{ inputs.griddataformats }}
${{ inputs.hypothesis }}
${{ inputs.matplotlib }}
${{ inputs.mda_xdrlib }}
${{ inputs.mmtf-python }}
${{ inputs.networkx }}
${{ inputs.numpy }}
Expand Down
3 changes: 3 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Fixes
Enhancements

Changes
* The `mda-xdrlib` module is now a core dependency of MDAnalysis
replacing the now deprecated `xdrlib` core Python library
(PR #4271)
* ConverterBase class moved from coordinates/base.py to converters/base.py (Issue #3404)

Deprecations
Expand Down
1 change: 0 additions & 1 deletion package/MDAnalysis/topology/TPRParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
__author__ = "Zhuyi Xue"
__copyright__ = "GNU Public Licence, v2"

import xdrlib

from . import guessers
from ..lib.util import openany
Expand Down
2 changes: 1 addition & 1 deletion package/MDAnalysis/topology/tpr/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"""

import numpy as np
import xdrlib
from mda_xdrlib import xdrlib
import struct

from . import obj
Expand Down
1 change: 1 addition & 0 deletions package/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies = [
'threadpoolctl',
'packaging',
'fasteners',
'mda-xdrlib',
]
keywords = [
"python", "science", "chemistry", "biophysics", "molecular-dynamics",
Expand Down
1 change: 1 addition & 0 deletions package/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ def long_description(readme):
'threadpoolctl',
'packaging',
'fasteners',
'mda-xdrlib',
]

setup(name='MDAnalysis',
Expand Down