Skip to content

Commit

Permalink
Pull request #196: Release/2.3.3
Browse files Browse the repository at this point in the history
Merge in HYP/hypernetx from release/2.3.3 to develop

* commit '50fdff1c6b55c6cb63f6ec5fe7549543dd556aa6':
  bump: version 2.3.2 → 2.3.3
  Fix github workflows
  Add poetry to cz config
  • Loading branch information
bonicim committed Jun 8, 2024
2 parents 1fdba07 + 50fdff1 commit c0b8d2b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
4 changes: 3 additions & 1 deletion .cz.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[tool.commitizen]
name = "cz_conventional_commits"
version = "2.3.3"
version_provider = "poetry"
version_files = [
"pyproject.toml",
"docs/source/conf.py",
"hypernetx/__init__.py"
"hypernetx/__init__.py",
".cz.toml"
]
tag_format = "v$major.$minor.$patch$prerelease"
update_changelog_on_bump = false
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
triggeredBy:
description: 'Name of team member who is manually triggering this workflow'
required: true
default: ''

defaults:
run:
Expand All @@ -28,10 +29,11 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- run: |
echo "This workflow was triggered by: $TRIGGER_PERSON"
- if: ${{ inputs.triggeredBy != '' }}
run: |
echo "This workflow was triggered by: $TEAM_MEMBER"
env:
TRIGGER_PERSON: ${{ inputs.triggeredBy }}
TEAM_MEMBER: ${{ inputs.triggeredBy }}
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-to-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
triggeredBy:
description: 'Name of team member who is manually triggering this workflow'
required: true
default: ''

jobs:

Expand All @@ -31,12 +32,11 @@ jobs:
attestations: write
id-token: write
steps:
- run: |
echo "This workflow was triggered by: $TRIGGER_PERSON"
- if: ${{ inputs.triggeredBy != '' }}
run: |
echo "This workflow was triggered by: $TEAM_MEMBER"
env:
TRIGGER_PERSON: ${{ inputs.triggeredBy }}
IMAGE_NAME: hypernetx/hypernetx:latest
TEAM_MEMBER: ${{ inputs.triggeredBy }}
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
Expand All @@ -57,7 +57,7 @@ jobs:
id: push
uses: docker/build-push-action@v5
with:
tags: ${{ env.IMAGE_NAME }}
tags: hypernetx/hypernetx:latest
push: true

- name: Generate artifact attestation
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
triggeredBy:
description: 'Name of team member who is manually triggering this workflow'
required: true
default: ''

permissions:
contents: read
Expand All @@ -27,10 +28,11 @@ jobs:
publish-to-pypi:
runs-on: ubuntu-latest
steps:
- run: |
echo "This workflow was triggered by: $TRIGGER_PERSON"
- if: ${{ inputs.triggeredBy != '' }}
run: |
echo "This workflow was triggered by: $TEAM_MEMBER"
env:
TRIGGER_PERSON: ${{ inputs.triggeredBy }}
TEAM_MEMBER: ${{ inputs.triggeredBy }}
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import os


__version__ = "2.3.2"
__version__ = "2.3.3"


# If extensions (or modules to document with autodoc) are in another directory,
Expand Down
2 changes: 1 addition & 1 deletion hypernetx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
from hypernetx.utils import *
from hypernetx.utils.toys import *

__version__ = "2.3.2"
__version__ = "2.3.3"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "hypernetx"
version = "2.3.2"
version = "2.3.3"
description = "HyperNetX is a Python library for the creation and study of hypergraphs."
authors = ["Brenda Praggastis <[email protected]>", "Dustin Arendt <[email protected]>",
"Sinan Aksoy <[email protected]>", "Emilie Purvine <[email protected]>",
Expand Down

0 comments on commit c0b8d2b

Please sign in to comment.