Skip to content

Commit

Permalink
Merge pull request #52 from gmrukwa/fixup-gin-config-dump
Browse files Browse the repository at this point in the history
Release v2.4.6
  • Loading branch information
gmrukwa committed Feb 21, 2020
2 parents e48b7bf + 067fd9e commit b7fb4f4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
MAJOR: ${{ 2 }}
MINOR: ${{ 4 }}
FIXUP: ${{ 5 }}
FIXUP: ${{ 6 }}
PACKAGE_INIT_FILE: ${{ 'divik/__init__.py' }}
PACKAGE_INIT_FILE_VERSION_LINE: ${{ 1 }}
PACKAGE_SETUP_FILE: ${{ 'setup.py' }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ docker pull gmrukwa/divik
To install specific version, you can specify it in the command, e.g.:

```bash
docker pull gmrukwa/divik:2.4.5
docker pull gmrukwa/divik:2.4.6
```

## Python package
Expand Down Expand Up @@ -79,7 +79,7 @@ pip install divik
or any stable tagged version, e.g.:

```bash
pip install divik==2.4.5
pip install divik==2.4.6
```

If you want to have compatibility with
Expand Down
2 changes: 1 addition & 1 deletion divik/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '2.4.5'
__version__ = '2.4.6'

from ._summary import plot, reject_split

Expand Down
6 changes: 5 additions & 1 deletion divik/_cli/fit_clusters.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ def experiment(
save(model, destination, xy=xy)


if __name__ == '__main__':
def main():
parse_gin_args()
experiment()


if __name__ == '__main__':
main()
2 changes: 1 addition & 1 deletion divik/core/_gin_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def dump_gin_args(destination):
except ImportError as ex:
raise ImportError(MISSING_GIN_ERROR) from ex
with open(os.path.join(destination, 'config.gin'), 'w') as outfile:
outfile.write(gin.operative_config_str)
outfile.write(gin.operative_config_str())


if _HAS_GIN:
Expand Down
4 changes: 2 additions & 2 deletions docs/instructions/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To install latest stable version use::

To install specific version, you can specify it in the command, e.g.::

docker pull gmrukwa/divik:2.4.5
docker pull gmrukwa/divik:2.4.6

Python package
--------------
Expand All @@ -31,7 +31,7 @@ package::

or any stable tagged version, e.g.::

pip install divik==2.4.5
pip install divik==2.4.6

If you want to have compatibility with
`gin-config <https://github.com/google/gin-config>`_, you can install
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys
import numpy

__version__ = '2.4.5'
__version__ = '2.4.6'

LINUX_OPTS = {
'extra_link_args': [
Expand Down Expand Up @@ -76,6 +76,7 @@
],
entry_points={
'console_scripts': [
'fit-clusters=divik._cli.fit_clusters:main',
'dunn-divik=divik._cli.dunn_divik:main',
'divik=divik._cli.divik:main',
'inspect=divik._cli.inspect:main',
Expand Down

0 comments on commit b7fb4f4

Please sign in to comment.