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

Update dependencies #57

Merged
merged 5 commits into from
Nov 20, 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
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ The rules for this file:
## [Unreleased]

### Authors
- ianmkenney

### Added
<!-- Added functionality -->

### Fixed
<!-- Fixes -->
- All dependencies added to pyproject.toml, setup.py, and conda envs (#57)

### Changed
<!-- Changes in existing functionality -->
Expand Down Expand Up @@ -76,4 +77,4 @@ in the AUTHORS.md file.

[Unreleased]: https://github.com/MDAnalysis/mdaencore/compare/1.0.0...HEAD
[1.0.0]: https://github.com/MDAnalysis/mdaencore/compare/0.1.0...1.0.0
[0.1.0]: https://github.com/MDAnalysis/mdaencore/releases/tag/0.1.0
[0.1.0]: https://github.com/MDAnalysis/mdaencore/releases/tag/0.1.0
4 changes: 3 additions & 1 deletion devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ dependencies:
- pip
- cython
- numpy
- scipy
- joblib
- scikit-learn

# MDAnalysis
- MDAnalysis
Expand All @@ -18,7 +21,6 @@ dependencies:
- pytest-xdist
- codecov
- MDAnalysisTests
- scikit-learn

# Pip-only installs
#- pip:
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies:

- numpy
- scipy
- joblib
- MDAnalysis
- cython
- MDAnalysisTests
- pytest

4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ readme = "README.md"
requires-python = ">=3.9"
dependencies = [
"MDAnalysis>=2.0.0",
"joblib",
"numpy",
"scipy",
]
keywords = [
"molecular simulations",
Expand All @@ -58,6 +61,7 @@ test = [
"pytest>=6.0",
"pytest-xdist>=2.5",
"pytest-cov>=3.0",
"MDAnalysisTests",
]
doc = [
"sphinx",
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ def extensions(debug=False, use_cython=True):
# do not use for Conda deployment
install_requires=[
"mdanalysis>=2.0.0",
"scipy",
"numpy",
"joblib",
],
# Additional entries you may want simply uncomment the lines you want and fill in the data
# url='mdaencore.readthedocs.io/en/latest/', # Website
Expand Down
Loading