Skip to content

Commit 6a59be9

Browse files
fresh2devfresh2dev
committed
Merge branch 'dev'
2 parents ec7cdc6 + 668363c commit 6a59be9

21 files changed

Lines changed: 408 additions & 402 deletions

‎.butterstack/fresh2-dev/.answers.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
_src_path: /var/home/d/sync/projects/py/hostbutter/src/hostbutter/resources/copier-butterstack
2+
environment: fresh2-dev
3+
flavor: sweet
4+
releaseName: argparse-tui-docs
5+
releaseNamespace: default

‎.butterstack/fresh2-dev/values.yaml.tpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<{{- $vars := (ds "vars") }}>
2+
<{{/* defineDatasource "vault" (printf "vault+https:///secret/data/releases/%s/%s" $vars.hostbutterSiteName $vars.releaseName) */}}>
3+
# Pull vault secrets like: <{{/* index (ds "vault").data "my-file.txt" | base64.Decode */}}>

‎.butterstack/fresh2-dev/vars.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Reusable variables specific to this environment and release.

‎.butterstack/hostbutter-net/.answers.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
_src_path: /var/home/d/sync/projects/py/hostbutter/src/hostbutter/resources/copier-butterstack
2-
domain: local.hostbutter.net
32
environment: hostbutter-net
43
flavor: sweet
5-
kube_context_name: default
6-
release_name: argparse-tui
7-
release_namespace: default
4+
releaseName: argparse-tui-docs
5+
releaseNamespace: default

‎.butterstack/hostbutter-net/values.yaml.tpl‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# Global values for this release.
2-
<{{- $releaseName := "argparse-tui" }}>
3-
<{{- $releaseEnv := getenv "HELMWAVE_ENV" | required "Missing required env var: HELMWAVE_ENV" -}}>
4-
<{{- defineDatasource "globalSharedVars" (printf "environments/vars.yaml") }}>
5-
<{{- defineDatasource "envSharedVars" (printf "environments/%s/vars.yaml" $releaseEnv) }}>
6-
<{{- defineDatasource "globalReleaseSharedVars" (printf "releases/%s/vars.yaml" $releaseName) }}>
7-
<{{- defineDatasource "envReleaseSharedVars" (printf "releases/%s/%s/vars.yaml" $releaseName $releaseEnv) }}>
8-
<{{- $vars := coll.Merge (ds "envReleaseSharedVars") (ds "globalReleaseSharedVars") (ds "envSharedVars") (ds "globalSharedVars") }}>
9-
<{{/* defineDatasource "vault" (printf "vault+https:///secret/data/releases/%s/%s" $releaseEnv $releaseName) */}}>
1+
<{{- $vars := (ds "vars") }}>
2+
<{{/* defineDatasource "vault" (printf "vault+https:///secret/data/releases/%s/%s" $vars.hostbutterSiteName $vars.releaseName) */}}>
103
# Pull vault secrets like: <{{/* index (ds "vault").data "my-file.txt" | base64.Decode */}}>
11-
# Variables from 'vars.yaml' are available in the variable `$vars`.

‎.butterstack/hostbutter-net/vars.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
11
# Reusable variables specific to this environment and release.
2-
3-
domain: "local.hostbutter.net"
4-
privateRegistry: "registry.local.hostbutter.net"
5-
6-
puid: "1000"
7-
pgid: "1000"
8-
tz: "America/Chicago"
9-
10-
subdomain: "www"
11-
routePrefix: "/r/argparse-tui"
12-
svcPort: 80

‎.copier-answers.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changes here will be overwritten by Copier
2-
_commit: a09a863
3-
_src_path: ssh://git@git.local.hostbutter.net/fresh2dev/copier-f2dv-project.git
2+
_commit: 78c3b92
3+
_src_path: ../../templates/copier-f2dv-project
44
author_email: hello@f2dv.com
55
author_name: Donald Mellenbruch
66
docs_slides_url: https://www.f2dv.com/s/argparse-tui
@@ -18,3 +18,4 @@ python_version: '3.8'
1818
repo_name: fresh2dev/argparse-tui
1919
repo_owner: fresh2dev
2020
repo_url: https://www.github.com/fresh2dev/argparse-tui
21+

.gitea/workflows/build-publish-image.yaml renamed to .gitea/workflows/build-deploy-image.yaml

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
fetch-depth: 0
2222
submodules: 'recursive'
2323

24-
# - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
24+
# - uses: fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
2525
# - uses: ./
26-
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
26+
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
2727
with:
2828
github-token: ${{ secrets.EGET_GITHUB_TOKEN }}
2929

@@ -81,9 +81,9 @@ jobs:
8181
submodules: 'recursive'
8282

8383
### Checkout
84-
# - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
84+
# - uses: fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
8585
# - uses: ./
86-
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
86+
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
8787

8888
- name: Dump github context
8989
run: echo "$GITHUB_CONTEXT"
@@ -92,7 +92,7 @@ jobs:
9292
GITHUB_CONTEXT: ${{ toJson(github) }}
9393

9494
- name: Dump env context
95-
run: echo "$env_context"
95+
run: echo "$env_context"
9696
shell: bash
9797
env:
9898
env_context: ${{ tojson(env) }}
@@ -115,9 +115,8 @@ jobs:
115115
platforms: linux/amd64 #,linux/arm64
116116
tags: |
117117
${{ env.PRIVATE_REGISTRY_DEV }}/${{ github.repository }}${{ matrix.image_suffix }}:${{ env.CI_COMMIT_SHORT_SHA }}
118-
# TODO: try to implement docker build cache again when Gitea 1.22 or 1.23 is released:
119-
# cache-from: type=gha,url=${{ env.ACTIONS_CACHE_URL }},token=${{ env.ACTIONS_RUNTIME_TOKEN }}
120-
# cache-to: type=gha,mode=max,url=${{ env.ACTIONS_CACHE_URL }},token=${{ env.ACTIONS_RUNTIME_TOKEN }}
118+
cache-from: type=gha,url=${{ env.ACTIONS_CACHE_URL }},token=${{ env.ACTIONS_RUNTIME_TOKEN }}
119+
cache-to: type=gha,mode=max,url=${{ env.ACTIONS_CACHE_URL }},token=${{ env.ACTIONS_RUNTIME_TOKEN }}
121120

122121
- name: Push image to Prod Registry
123122
if: >
@@ -143,9 +142,9 @@ jobs:
143142
submodules: 'recursive'
144143

145144
### Checkout
146-
# - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
145+
# - uses: fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
147146
# - uses: ./
148-
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
147+
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
149148

150149
- if: >
151150
endsWith(github.repository, '/hostbutter')
@@ -164,35 +163,3 @@ jobs:
164163
run: |
165164
butter --site $HOSTBUTTER_SITE_PROD stack up
166165
167-
# promote-image:
168-
# if: >
169-
# github.ref_type == 'tag'
170-
# needs: ['build-publish-image']
171-
# runs-on: 'ubuntu-latest'
172-
# env:
173-
# SRC_REGISTRY: registry.local.hostbutter.net
174-
# strategy:
175-
# matrix:
176-
# image_name:
177-
# - ${{ github.repository }}
178-
# public_registry:
179-
# - docker.io
180-
# - ghcr.io
181-
# fail-fast: true
182-
# steps:
183-
# ### Checkout
184-
# - name: Check out repository code
185-
# uses: actions/checkout@v4
186-
# with:
187-
# fetch-depth: 0
188-
# submodules: 'recursive'
189-
#
190-
# ### Checkout
191-
# # - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
192-
# # - uses: ./
193-
# - uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
194-
#
195-
# - name: Push image to Cloud Registries on tag
196-
# run: |
197-
# docker buildx imagetools create --tag ${{ matrix.public_registry }}/${{ matrix.image_name }}:$CI_PROJECT_VERSION \
198-
# ${{ env.SRC_REGISTRY }}/${{ matrix.image_name }}:$CI_COMMIT_SHORT_SHA

‎.gitea/workflows/build-publish-python-package.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
# needs: ['setup']
1717
name: Test with Python v${{ matrix.python-version }}
1818
if: >
19-
github.ref_type == 'tag'
20-
|| format('refs/heads/{0}', github.event.repository.default_branch) == github.ref
19+
github.ref_type != 'tag'
20+
&& format('refs/heads/{0}', github.event.repository.default_branch) != github.ref
2121
runs-on: 'ubuntu-latest'
2222
strategy:
2323
matrix:
24-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
24+
python-version: ['3.9', '3.10', '3.11', '3.12']
2525
max-parallel: 3
2626
fail-fast: true
2727
steps:
@@ -33,12 +33,12 @@ jobs:
3333
submodules: 'recursive'
3434

3535

36-
# - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
36+
# - uses: fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
3737
# - uses: ./
38-
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
38+
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
3939

4040
- name: Set up Python v${{ matrix.python-version }}
41-
uses: actions/setup-python@v4
41+
uses: actions/setup-python@v5
4242
with:
4343
python-version: ${{ matrix.python-version }}
4444

@@ -59,9 +59,9 @@ jobs:
5959
fetch-depth: 0
6060
submodules: 'recursive'
6161

62-
# - uses: fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
62+
# - uses: fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
6363
# - uses: ./
64-
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@4e3f5065f9cc1cd24dcc3184fbbf601f48075eb3
64+
- uses: https://gitea.local.hostbutter.net/fresh2dev/hostbutter@01f6cc2ffa2f916e237c458d1641314aed3d15bb
6565

6666
- name: Test Python Project
6767
run: |

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## 0.2.6 - 2024-10-23
6+
7+
> This release cherry-picks several upstream fixes introduced in [Trogon v0.6.0](https://github.com/Textualize/trogon/releases/tag/v0.6.0)
8+
9+
**Full Changelog**: https://github.com/fresh2dev/argparse-tui/compare/0.2.5...0.2.6
10+
11+
### :fist: Fixes
12+
13+
- Fixing typing issues, ensure *args and **kwargs are passed to App superclass to help compatibility. Use `get_default_screen` instead of pushing a screen on_mount.
14+
- Fix crashes on modern Textual, involving minor refactors
15+
- Do not treat Select.BLANK as a supplied value
16+
17+
### :point_right: Changes
18+
19+
- Minimum Python version is now 3.8.1
20+
- Update textualize dependency spec
21+
522
## 0.2.5 - 2024-09-08
623

724
**Full Changelog**: https://github.com/fresh2dev/argparse-tui/compare/0.2.4...0.2.5

0 commit comments

Comments
 (0)