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

Merge upstream branch, trunk, into develop #150

Merged
merged 5 commits into from
Apr 10, 2024
Merged

Merge upstream branch, trunk, into develop #150

merged 5 commits into from
Apr 10, 2024

Conversation

ebb-earl-co
Copy link
Owner

No description provided.

ebb-earl-co and others added 5 commits April 7, 2024 15:59
* Delete .github/workflows/pyapp-linux.yml

* Delete .github/workflows/pyapp-macos_arm64.yml

* Delete .github/workflows/pyapp-macos_x86.yml

* Delete .github/workflows/pyapp-windows.yml
* Update .github/workflows/pyinstaller-*:

Use FFmpeg 7.0 and Python 3.12.2 in all pyinstaller invocations
Remove libfdk-aac in Dockerfile and pyinstaller-*.yml as keeping track of the .so and .a files isn't worth the hassle

* Update {README,BUILDME}.md with reference to new executables

* Revamp pyinstaller.py to be tidal_wave/main.py but with match, case flow

* Remove PyApp GitHub Actions Workflow Files (#147) (#148)

* Delete .github/workflows/pyapp-linux.yml

* Delete .github/workflows/pyapp-macos_arm64.yml

* Delete .github/workflows/pyapp-macos_x86.yml

* Delete .github/workflows/pyapp-windows.yml

* Change pyinstaller-macos_x86.yml to use 'macos-13' and pyinstaller-macos_arm64.yml to use 'macos-14'

* Remove pyinstaller.py from the flake8 linting

* Make edits based on flake8

* Bump version to 2024.4.2
Remove duplicate text in linked release binaries
* Dependabot monitoring PyPi dependencies(deps): Bump typer (#151)

Bumps [typer](https://github.com/tiangolo/typer) from 0.12.1 to 0.12.2.
- [Release notes](https://github.com/tiangolo/typer/releases)
- [Changelog](https://github.com/tiangolo/typer/blob/master/docs/release-notes.md)
- [Commits](tiangolo/typer@0.12.1...0.12.2)

---
updated-dependencies:
- dependency-name: typer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Dependabot monitoring PyPi dependencies(deps): Bump typer (#152)

Bumps [typer](https://github.com/tiangolo/typer) from 0.12.2 to 0.12.3.
- [Release notes](https://github.com/tiangolo/typer/releases)
- [Changelog](https://github.com/tiangolo/typer/blob/master/docs/release-notes.md)
- [Commits](tiangolo/typer@0.12.2...0.12.3)

---
updated-dependencies:
- dependency-name: typer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Put back 'macOS [m]' in login.py prompt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ebb-earl-co ebb-earl-co self-assigned this Apr 10, 2024
@ebb-earl-co ebb-earl-co merged commit 4633dc5 into develop Apr 10, 2024
48 checks passed
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.

None yet

1 participant