Skip to content

Commit

Permalink
Final clean up of OM release
Browse files Browse the repository at this point in the history
  • Loading branch information
ginty committed Aug 6, 2024
1 parent 390c166 commit 246c778
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 33 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,20 @@ jobs:
- name: List OM Wheels
run: ls -al ./om_wheels

- name: Retrieve Origen Wheels
uses: actions/download-artifact@v3
with:
name: origen_wheels
path: origen_wheels
#- name: Retrieve Origen Wheels
# uses: actions/download-artifact@v3
# with:
# name: origen_wheels
# path: origen_wheels

- name: List Origen Wheels
run: ls -al ./origen_wheels
#- name: List Origen Wheels
# run: ls -al ./origen_wheels

- name: Upload CLI as a standalone entity
uses: actions/upload-artifact@v3
with:
name: cli
path: python\origen\origen\__bin__\bin\origen.exe
#- name: Upload CLI as a standalone entity
# uses: actions/upload-artifact@v3
# with:
# name: cli
# path: python\origen\origen\__bin__\bin\origen.exe

publish_to_pypi_test:
needs: [build_om_linux] #, build_windows]
Expand Down Expand Up @@ -585,23 +585,23 @@ jobs:
verify-metadata: false
verbose: true

- name: Retrieve Wheels
uses: actions/download-artifact@v3
with:
name: origen_wheels
path: origen_wheels

- name: List Origen Wheels
run: ls -al ./origen_wheels

- name: Push To PyPi Server
if: ${{ github.event.inputs.origen_python_package == 'true' }}
uses: pypa/gh-action-pypi-publish@v1.9.0
with:
packages-dir: origen_wheels
password: ${{ secrets.PYPI_ORIGEN_API_TOKEN }}
verify-metadata: false
verbose: true
#- name: Retrieve Wheels
# uses: actions/download-artifact@v3
# with:
# name: origen_wheels
# path: origen_wheels

#- name: List Origen Wheels
# run: ls -al ./origen_wheels

#- name: Push To PyPi Server
# if: ${{ github.event.inputs.origen_python_package == 'true' }}
# uses: pypa/gh-action-pypi-publish@v1.9.0
# with:
# packages-dir: origen_wheels
# password: ${{ secrets.PYPI_ORIGEN_API_TOKEN }}
# verify-metadata: false
# verbose: true

publish_github_release:
needs: [build_om_linux] #, build_windows]
Expand Down
15 changes: 14 additions & 1 deletion python/origen_metal/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "origen_metal"
version = "0.4.1-dev3"
version = "0.4.1-dev4"
description = "Bare metal APIs for the Origen SDK"
homepage = "https://origen-sdk.org/o2"
license = "MIT"
Expand All @@ -9,11 +9,24 @@ authors = ["Origen-SDK"]

[tool.poetry.dependencies]
python = ">=3.7.0,<3.13"
#*****************************************************
# Any changes here must be mirrored in the [project] section below!!!!!
#*****************************************************
pyreadline3 = { version="^3.3", platform="win32" }
termcolor = ">= 1.1.0"
colorama = ">= 0.4.4" # Note: colorama is usually installed on the system already, but it isn't actually required (e.g. WSL won't have this by default)
importlib-metadata = ">= 6.7.0" # For use with Python pre-3.8

[project]
name = "origen-metal"
requires-python = ">=3.7.0,<3.13"
dependencies = [
"colorama (>=0.4.4)",
"importlib-metadata (>=6.7.0)",
"pyreadline3 (>=3.3,<4.0) ; sys_platform == 'win32'",
"termcolor (>=1.1.0)"
]

[tool.poetry.dev-dependencies]
pytest = "^6.2.4"
pdoc = "^7"
Expand Down
2 changes: 1 addition & 1 deletion rust/pyapi/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/pyapi_metal/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/pyapi_metal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "origen-metal"
version = "0.4.1-dev3"
version = "0.4.1-dev4"
edition = "2021"
authors = ["Origen-SDK"]

Expand Down

0 comments on commit 246c778

Please sign in to comment.