Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
csadorf committed Jul 22, 2019
2 parents 03c0405 + 36d1e68 commit b100fc0
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.1.0
current_version = 1.2.0
commit = True
tag = False
message = Bump up to version {new_version}.
Expand Down
6 changes: 5 additions & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
{
"affiliation": "University of Michigan",
"name": "Kelly Wang"
},
{
"affiliation": "University of Michigan",
"name": "Alexander Adams"
}
],
"creators": [
Expand Down Expand Up @@ -74,5 +78,5 @@
"id": "http://www.opensource.org/licenses/BSD-3-Clause"
},
"title": "signac",
"version": "1.1.0"
"version": "1.2.0"
}
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
---
cff-version: "1.0.3"
title: signac
version: 1.1.0
version: 1.2.0
abstract: |
The signac framework helps users manage and scale file-based workflows, facilitating data
reuse, sharing, and reproducibility. It provides a simple and robust data model to create
Expand Down
31 changes: 20 additions & 11 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Changelog

The **signac** package follows `semantic versioning <https://semver.org/>`_.

Version 1.0
===========
Version 1
=========

Highlights
----------
Expand All @@ -17,18 +17,27 @@ Highlights
- Support for compressed Collection files.


next
----
[1.2.0] -- 2019-07-22
---------------------

- Keep signac shell command history on a per-project basis.
- Reduce the logging verbosity about a missing default host key in the configuration (#201).
- Add ``read_json()`` and ``to_json()`` methods to Collection class (#104).
- Fix issue with incorrect detection of dict-like files managed with the ``DictManager`` class (e.g. ``job.stores``) (#203).
Added
+++++

- Keep signac shell command history on a per-project basis (#134, #194).
- Add ``read_json()`` and ``to_json()`` methods to ``Collection`` class (#104, #200).

Fixed
+++++

- Fix issue where shallow copies of instances of ``Job`` would behave incorrectly (#153, #207).
- Fix issue causing a failure of the automatic conversion of valid key types (#168, #205).
- Improve the 'dots in keys' error message to make it easier to fix related issues (#170, #205).
- Update the ``__repr__`` and ``__repr_html__`` implementations of the ``Project`, ``Job``, and ``JobsCursor`` classes (#193).
- Fix issue with rendering views from the command line for single job project (#208).
- Fix issue with heterogeneous types in state point values that are lists (#209).
- Update the ``__repr__`` and ``__repr_html__`` implementations of the ``Project``, ``Job``, and ``JobsCursor`` classes (#193).
- Reduce the logging verbosity about a missing default host key in the configuration (#201).
- Fix issue with incorrect detection of dict-like files managed with the ``DictManager`` class (e.g. ``job.stores``) (#203).
- Fix issue with generating views from the command line for projects with only one job (#208, #211).
- Fix issue with heterogeneous types in state point values that are lists (#209, #210).


[1.1.0] -- 2019-05-19
---------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ def __getattr__(cls, name):
# built documents.
#
# The short X.Y version.
version = '1.1.0'
version = '1.2.0'
# The full version, including alpha/beta/rc tags.
release = '1.1.0'
release = '1.2.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='signac',
version='1.1.0',
version='1.2.0',
packages=find_packages(),
zip_safe=True,

Expand Down
2 changes: 1 addition & 1 deletion signac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
from .core.h5store import H5StoreManager


__version__ = '1.1.0'
__version__ = '1.2.0'

__all__ = ['__version__', 'contrib', 'db', 'errors', 'warnings', 'sync',
'cite',
Expand Down

0 comments on commit b100fc0

Please sign in to comment.