Skip to content

Commit

Permalink
Merge pull request #672 from ScilifelabDataCentre/revert-671-revert-6…
Browse files Browse the repository at this point in the history
…69-dev

Revert "Revert "New release 2023-12-20""
  • Loading branch information
valyo authored Dec 18, 2023
2 parents e644cb3 + 57b2c14 commit fe6615c
Show file tree
Hide file tree
Showing 9 changed files with 219 additions and 206 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
==========

.. _2.6.1:

2.6.1 - 2023-12-20
~~~~~~~~~~~~~~~~~~~

- Dependencies:
- `cryptography` from `41.0.3` to `41.0.6`

.. _2.6.0:

2.6.0 - 2023-10-25
Expand Down
5 changes: 5 additions & 0 deletions SPRINTLOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,3 +318,8 @@ _Empty sprint_
# 2023-11-06 - 2023-11-17

- New version: 2.6.0 ([#666](https://github.com/ScilifelabDataCentre/dds_cli/pull/666))

# 2023-12-4 - 2023-12-15

- Patch update crypthography package to address cve ([#668](https://github.com/ScilifelabDataCentre/dds_cli/pull/668))
- New version: 2.6.1 ([#669](https://github.com/ScilifelabDataCentre/dds_cli/pull/669))
2 changes: 1 addition & 1 deletion dds_cli/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""DDS CLI version."""
# Do not change bump the major version unless absolutely necessary - makes incompatible with API
# If mid or minor version reaches 9, continue to 10, 11 etc.
__version__ = "2.6.0"
__version__ = "2.6.1"
174 changes: 87 additions & 87 deletions img/dds-help-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
174 changes: 87 additions & 87 deletions img/dds-help-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions img/dds-version.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions img/python-version.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions img/python3-version.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ boto3==1.24.73
botocore==1.27.73
click==8.1.3
click-pathlib==2020.3.13.0
cryptography==41.0.3
cryptography==41.0.6
immutabledict==2.2.1
jwcrypto==1.4.2
prettytable==3.4.1
Expand Down

0 comments on commit fe6615c

Please sign in to comment.