Skip to content

Commit

Permalink
Merge pull request #144 from openkim/devel
Browse files Browse the repository at this point in the history
Fix installing ptemcee
  • Loading branch information
mjwen authored Dec 17, 2023
2 parents ae06ce0 + 68cfa16 commit be04881
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install .[test]
# TODO, here, we install ptemcee from Yonatan's fork. See setup.py for details.
python -m pip install git+https://github.com/yonatank93/ptemcee.git@enhance_v1.0.0
- name: Run tests
shell: bash -el {0}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## v0.4.2 (2023/12/17)

- Fix installing ptemcee

## v0.4.2 (2023/12/16)

### Enhancements 🛠
Expand Down
2 changes: 1 addition & 1 deletion devtool/update_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def update_version(version, path, key, in_quotes=False, extra_space=False):
if __name__ == "__main__":
major = 0
minor = 4
patch = 2
patch = 3

mmp = f"{major}.{minor}.{patch}"
mm = f"{major}.{minor}"
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# The short X.Y version
version = "0.4"
# The full version, including alpha/beta/rc tags
release = "0.4.2"
release = "0.4.3"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion kliff/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.4.2"
__version__ = "0.4.3"

import warnings

Expand Down
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ def get_readme():
"pytest",
"kimpy",
"emcee",
"ptemcee @ git+https://github.com/yonatank93/ptemcee.git@enhance_v1.0.0",
"ptemcee",
# TODO: ptemcee is too old to be compatible with latest numpy, so Yonatan
# forked it and fixed it (in the below link). However, the forked version
# is not on PyPI, can PyPI does not accept use non PyPI package as
# dependency.
# Solution: create a new PyPI package for ptemcee.
# "ptemcee @ git+https://github.com/yonatank93/ptemcee.git@enhance_v1.0.0",
"torch",
"numpy",
],
Expand Down

0 comments on commit be04881

Please sign in to comment.