Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix release workflows to disconnect from pypi #4

Merged
merged 16 commits into from
Mar 18, 2024
Merged

Conversation

Treesarj
Copy link
Collaborator

Description:

Type of change:

  • Bug fix.
  • New feature.
  • Documentation update.

Checklist for the reviewer:

This checklist should be used as a help for the reviewer.

  • Is the change limited to one issue?
  • Does this PR close the issue?
  • Is the code easy to read and understand, including clearly named variables?
  • Do all new feature have an accompanying new test?
  • Has the documentation been updated as necessary?

Treesarj and others added 4 commits March 14, 2024 13:21
* update strategies

* fix pre-commit

* create json parse strategy

* update parse strategies

* Updated dlite storage path

* Fixed duplication of data model names. Improved readability of the code

* Instanciate the Pydantic datamodel from a dict

* Added error handling#

* Set collection_id. Updated datamodel

* Updated parse strategy

* Update json strategy config

* Update json strategy config

* Added entity to config

* camel case storagePath

* rename storage path

* Refactor initialize method

* add quantity to generate

* Revert "add quantity to generate"

This reverts commit e000232.

* remove unused session parameter

* update otelib version

* update requirements.txt

* update oteapi-core

* fix pylint errors

* remove unnecessary session parameter

* fix otelib version

* fix tests

* fix test_generate

* fix syntax

* fix test_generate collection

* fix test_filter

* fix test_generate_collection

* update dataresource in test_convert

* fix test_convert, and pylint

* fix tests

* test_parse_json

* test_parse_json

* fix test_parse

* fix test_convert

* fix pylint errors

* replace resourceconfig with Parserconfig in parse strategies

* fix parse strategy

* -

* revert

* Allow for defining triplestore backend in the mapping strategy (EMMC-ASBL#225)

* Allow for defining triplestore backend in the mapping strategy

Co-authored-by: Thomas F. Hagelien <[email protected]>

* -

* remove unnecessary files

* fix test_parse_json

* -

* fix import error

* fix path issue

* fix  test_mapping

* -

* fix collection

* update  config in test_config

* fix test_parse_excel

* fix test_parse_excel

* -

* fix excel parser

* -

* fix test_image_config

* remove unnecessary startegies

* run pre-commit

* fix pylint issues

* fix pylint and docs

* remove unused strategies and add doc strings

* remove unused test entities and files

* -

* -

* -

* fix warning

* Revert "Remove session"

---------

Co-authored-by: Thomas F. Hagelien <[email protected]>
Co-authored-by: Thomas Hagelien <[email protected]>
* Bump pypa/gh-action-pypi-publish from 1.8.12 to 1.8.14 (EMMC-ASBL#224)

Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.12 to 1.8.14.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.8.12...v1.8.14)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update pytest requirement from ~=8.0 to ~=8.1 (EMMC-ASBL#227)

Updates the requirements on [pytest](https://github.com/pytest-dev/pytest) to permit the latest version.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.0.0...8.1.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update mkdocstrings[python] requirement from ~=0.24.0 to ~=0.24.1 (EMMC-ASBL#226)

Updates the requirements on [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings) to permit the latest version.
- [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases)
- [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md)
- [Commits](mkdocstrings/mkdocstrings@0.24.0...0.24.1)

---
updated-dependencies:
- dependency-name: mkdocstrings[python]
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update `pre-commit` hooks

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Treesa Joseph <[email protected]>
@Treesarj Treesarj self-assigned this Mar 15, 2024
Treesarj and others added 11 commits March 15, 2024 14:19
* update strategies

* fix pre-commit

* create json parse strategy

* update parse strategies

* Updated dlite storage path

* Fixed duplication of data model names. Improved readability of the code

* Instanciate the Pydantic datamodel from a dict

* Added error handling#

* Set collection_id. Updated datamodel

* Updated parse strategy

* Update json strategy config

* Update json strategy config

* Added entity to config

* camel case storagePath

* rename storage path

* Refactor initialize method

* add quantity to generate

* Revert "add quantity to generate"

This reverts commit e000232.

* remove unused session parameter

* update otelib version

* update requirements.txt

* update oteapi-core

* fix pylint errors

* remove unnecessary session parameter

* fix otelib version

* fix tests

* fix test_generate

* fix syntax

* fix test_generate collection

* fix test_filter

* fix test_generate_collection

* update dataresource in test_convert

* fix test_convert, and pylint

* fix tests

* test_parse_json

* test_parse_json

* fix test_parse

* fix test_convert

* fix pylint errors

* replace resourceconfig with Parserconfig in parse strategies

* fix parse strategy

* -

* revert

* Allow for defining triplestore backend in the mapping strategy (EMMC-ASBL#225)

* Allow for defining triplestore backend in the mapping strategy

Co-authored-by: Thomas F. Hagelien <[email protected]>

* -

* remove unnecessary files

* fix test_parse_json

* -

* fix import error

* fix path issue

* fix  test_mapping

* -

* fix collection

* update  config in test_config

* fix test_parse_excel

* fix test_parse_excel

* -

* fix excel parser

* -

* fix test_image_config

* remove unnecessary startegies

* run pre-commit

* fix pylint issues

* fix pylint and docs

* remove unused strategies and add doc strings

* remove unused test entities and files

* -

* -

* -

* fix warning

* Revert "Remove session"

---------

Co-authored-by: Thomas F. Hagelien <[email protected]>
Co-authored-by: Thomas Hagelien <[email protected]>
@Treesarj
Copy link
Collaborator Author

Maybe we can remove certain steps in the CD_release.yml as it doesn't have access to certain env variables /secrets?

@Treesarj Treesarj requested a review from CasperWA March 15, 2024 13:42
Copy link

@CasperWA CasperWA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we were using SINTEF/ci-cd here. That workflow has an option to not publish on PyPI using the publish_on_pypi input parameter. This one does not.
But here it is as easy as removing that step in the workflow.

Indeed, for this to work in a more optimized way, SINTEF/ci-cd callable workflows should be used. In any case - this is fine, as long as the publish to pypi step is removed :)

.github/workflows/cd_release.yml Outdated Show resolved Hide resolved
@Treesarj Treesarj requested a review from CasperWA March 18, 2024 09:33
Copy link

@CasperWA CasperWA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be fine :)

@Treesarj Treesarj merged commit 925ba4a into master Mar 18, 2024
8 checks passed
@Treesarj Treesarj deleted the fix-workflows branch March 18, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants