Skip to content

Commit a7ee3cd

Browse files
authored
Merge pull request #880 from zapta/main
Assorted tweaks
2 parents ba2845b + 4db1e3e commit a7ee3cd

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

.github/workflows/monitor-apio-pypi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
apio sim --no-gtkwave
7373
apio graph -n
7474
apio format
75-
apio devices usb
76-
apio devices serial
75+
apio devices scan-usb
76+
apio devices scan-serial
7777
7878
find .
7979

.github/workflows/publish-to-pypi.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
workflow_dispatch:
66
inputs:
77
release_tag:
8-
description: "Release tag, e.g. 2025-12-10"
8+
description: "Apio CLI release tag, e.g. 2025-12-10"
99
required: true
1010
type: string
1111

@@ -79,6 +79,10 @@ jobs:
7979
# Creates dist/*.tar.gz and dist/*.whl from pyproject.toml
8080
python -m build
8181
82+
- name: List package items
83+
run: |
84+
tar -tzf dist/*.tar.gz | tree --fromfile .
85+
8286
# -- Publish to Pypi!!
8387
- name: Publish to PyPi
8488
env:

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ This README page is optimized for its appearance in the github repo rather than
33
-->
44

55
<!-- Page banner -->
6-
![apio-cli-banner](media/apio-cli-banner.png)
6+
![apio-cli-banner](https://raw.githubusercontent.com/zapta/apio/main/media/apio-cli-banner.png)
77

88
<!-- Attributes badges -->
99
[![license](https://img.shields.io/badge/License-GPL%203.0-blue.svg)](https://github.com/FPGAwars/apio/blob/main/LICENSE)
1010
[![python](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue)](https://pypi.org/project/apio)
1111

1212
<!-- Platforms badges -->
13-
![linux](media/linux-logo.png)&nbsp;&nbsp;&nbsp;![macos](media/macosx-logo.png)&nbsp;&nbsp;&nbsp;![windows](media/windows-logo.png)&nbsp;&nbsp;&nbsp;![raspberry-pi](media/raspbian-logo.png)
13+
![linux](https://raw.githubusercontent.com/zapta/apio/main/media/linux-logo.png)&nbsp;&nbsp;&nbsp;![macos](https://raw.githubusercontent.com/zapta/apio/main/media/macosx-logo.png)&nbsp;&nbsp;&nbsp;![windows](https://raw.githubusercontent.com/zapta/apio/main/media/windows-logo.png)&nbsp;&nbsp;&nbsp;![raspberry-pi](media/raspbian-logo.png)
1414

1515
<!-- Status badges -->
1616
[![cli-test](https://img.shields.io/github/actions/workflow/status/fpgawars/apio/test.yaml?label=cli-test)](https://github.com/fpgawars/apio/actions/workflows/test.yaml)
@@ -33,13 +33,18 @@ This README page is optimized for its appearance in the github repo rather than
3333

3434
---
3535

36+
37+
> **NOTE:&nbsp;&nbsp;Apio IDE for Visual Studio Code.**
38+
> Apio is also available as an extension for Visual Studio Code. To install it, visit the [Apio IDE page](https://marketplace.visualstudio.com/items?itemName=fpgawars.apio) in the Visual Studio Code Marketplace.
39+
> The rest of this page describes the command line version of Apio.
40+
41+
3642
Apio CLI is an easy to install and use command-line tool for FPGA design from A to Z. For a quick start, visit the [Getting started with Apio](https://fpgawars.github.io/apio/docs/quick-start) guide.
3743

38-
<br>
3944

4045
Simulation example:
4146

42-
![GTKWave screenshot](media/sim-gtkwave.png)
47+
![GTKWave screenshot](https://raw.githubusercontent.com/zapta/apio/main/media/sim-gtkwave.png)
4348

4449
## Description
4550

@@ -57,7 +62,7 @@ Apio CLI currently supports over 80 FPGA boards, custom boards can be easily add
5762
4. `apio sim` - simulate the design and show signals.
5863
5. `apio upload` - program the FPGA board.
5964

60-
![apio-cli-animation](media/apio-cli-animation.gif)
65+
![apio-cli-animation](https://raw.githubusercontent.com/zapta/apio/main/media/apio-cli-animation.gif)
6166

6267
## Apio CLI in the media
6368

apio/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# -- DEVELOPER:
1515
# -- Change this release number and date when releasing a new Apio CLI version.
1616
# -- If incrementing Major or Minor, a new remote config file is required.
17-
APIO_VERSION = (1, 4, 0) # Major, Minor, Patch.
17+
APIO_VERSION = (1, 4, 1) # Major, Minor, Patch.
1818

1919
# -- This is set automatically during build or publishing information to
2020
# -- provide additional information about the release. This string is included

pyproject.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ build-backend = "flit_core.buildapi"
99
"Homepage" = "https://github.com/fpgawars/apio"
1010
"Documentation" = "https://fpgawars.github.io/apio/docs"
1111
"Bugs Tracker" = "https://github.com/fpgawars/apio/issues"
12-
"Wiki" = "https://github.com/fpgawars/apio/wiki"
1312
"Discussions" = "https://github.com/fpgawars/apio/discussions"
13+
"Apio IDE" = "https://marketplace.visualstudio.com/items?itemName=fpgawars.apio"
1414

1515
[tool.flit.metadata]
1616
module = "apio"
@@ -56,14 +56,15 @@ requires = [
5656
]
5757

5858
[tool.flit.sdist]
59-
# TODO: Revisit 'exclude`. What else we don't need in the package?
60-
exclude = ["tests/"]
61-
62-
[tool.flit.metadata.requires-extra]
63-
blackiceprog = ['blackiceprog==2.0.0']
64-
litterbox = ['litterbox==0.2.2']
65-
tinyfpgab = ['tinyfpgab==1.1.0']
66-
icefunprog = ['icefunprog==2.0.3']
59+
# Note that we don't include 'media/' nor do we have relative references
60+
# from README.md to resources in media since pypi doesn't show them
61+
# correctly. Instead we use absolute links to github.
62+
include = [
63+
"apio/",
64+
"pyproject.toml",
65+
"README.md",
66+
"LICENSE",
67+
]
6768

6869
[tool.flit.scripts]
6970
apio = "apio.__main__:main"

0 commit comments

Comments
 (0)