Skip to content

Commit

Permalink
Merge branch 'main' into conda-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
orbeckst authored Jan 2, 2024
2 parents 8969f65 + 941dbb1 commit 69aaf8c
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 2,490 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
- name: Build and install package
run: |
mamba env update -n test -f devtools/conda-envs/test_env.yaml
python setup.py build_ext -i
python -m pip install -e .
- name: build docs
Expand All @@ -59,4 +58,4 @@ jobs:
if: github.event_name == 'pull_request'
with:
name: pr_docs
path: ./docs/build/
path: ./docs/build/
4 changes: 2 additions & 2 deletions .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ jobs:

- name: Install dependencies
run: |
pip install setuptools cython numpy twine
pip install pipx twine
- name: Build package
run: |
python setup.py sdist
python -m pipx run build --sdist
- name: Check package build
run: |
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ The rules for this file:
- IAlibay

### Added
- Added conda-forge install instruction to docs (PR #14)
- Added conda-forge install instruction to docs (Issue #13, PR #14)
- Support for Python 3.12 (Issue #11, PR #12)

### Fixed
<!-- Bug fixes -->
- Changed logger to no longer point to MDAnalysis.analysis

### Changed
<!-- Changes in existing functionality -->
- Switch from versioneer to versioningit

### Deprecated
<!-- Soon-to-be removed features -->
Expand Down
11 changes: 4 additions & 7 deletions pathsimanalysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@

due.cite(Doi("10.1371/journal.pcbi.1004568"),
description="Path Similarity Analysis algorithm and implementation",
path="MDAnalysis.analysis.psa",
path="pathsimanalysis.psa",
cite_module=True)
del Doi

# Handle versioneer
from ._version import get_versions
versions = get_versions()
__version__ = versions['version']
__git_revision__ = versions['full-revisionid']
del get_versions, versions
# Handle version
from importlib.metadata import version
__version__ = version("pathsimanalysis")
Loading

0 comments on commit 69aaf8c

Please sign in to comment.