Skip to content

Commit

Permalink
Merge pull request #38 from kushalbakshi/main
Browse files Browse the repository at this point in the history
Add `session_id` to `session_with_datetime`
  • Loading branch information
Thinh Nguyen authored Jan 25, 2024
2 parents 5b92b6a + d5e0001 commit 6f5fb0f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ on:
jobs:
make_github_release:
uses: datajoint/.github/.github/workflows/make_github_release.yaml@main
pypi_release:
needs: make_github_release
uses: datajoint/.github/.github/workflows/pypi_release.yaml@main
secrets:
TWINE_USERNAME: ${{secrets.TWINE_USERNAME}}
TWINE_PASSWORD: ${{secrets.TWINE_PASSWORD}}
with:
UPLOAD_URL: ${{needs.make_github_release.outputs.release_upload_url}}
mkdocs_release:
uses: datajoint/.github/.github/workflows/mkdocs_release.yaml@main
permissions:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.

## [0.2.0] - 2024-01-25

+ Add - `session_id` attribute to `Session` in `session_with_datetime.py`
+ Update - Remove PyPI release from GitHub Actions workflow

## [0.1.7] - 2023-11-30

+ Allow null value for `session_datetime` in `session_with_id`
+ Update - Allow null value for `session_datetime` in `session_with_id`

## [0.1.6] - 2023-09-18

Expand Down Expand Up @@ -48,6 +53,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
+ Add - GitHub Action release process
+ Add - `session` schema

[0.2.0]: https://github.com/datajoint/element-session/releases/tag/0.2.0
[0.1.7]: https://github.com/datajoint/element-session/releases/tag/0.1.7
[0.1.6]: https://github.com/datajoint/element-session/releases/tag/0.1.6
[0.1.5]: https://github.com/datajoint/element-session/releases/tag/0.1.5
Expand Down
5 changes: 4 additions & 1 deletion element_session/session_with_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,16 @@ class Session(dj.Manual):
"""Central Session table
Attributes:
Subject (foreign key): Key for Subject table
Subject (foreign key): Primary key from Subject table
session_datetime (datetime): date and time of the session
session_id (int, optional): numerical session identifier
"""

definition = """
-> Subject
session_datetime: datetime
---
session_id=null: int
"""

class Attribute(dj.Part):
Expand Down
2 changes: 1 addition & 1 deletion element_session/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Package metadata."""
__version__ = "0.1.7"
__version__ = "0.2.0"

0 comments on commit 6f5fb0f

Please sign in to comment.