Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: amaranth-lang/amaranth-yosys
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 187f764958cf
Choose a base ref
...
head repository: amaranth-lang/amaranth-yosys
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4e9125672a6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 5, 2021

  1. Build wheels using PEP 517 tooling.

    @whitequark
    whitequark committed Nov 5, 2021
    Copy the full SHA
    a3a1262 View commit details

  2. Simplify CI workflow.

    @whitequark
    whitequark committed Nov 5, 2021
    Copy the full SHA
    b4e9125 View commit details
Showing with 5 additions and 6 deletions.
  1. +4 −4 .github/workflows/main.yml
  2. +1 −2 setup.py
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
uses: actions/setup-python@v2
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools setuptools_scm wheel
python -m pip install setuptools_scm # for setup.py --version
sudo apt-get install flex bison ccache
- name: Set up ccache
uses: actions/cache@v1
@@ -26,15 +26,15 @@ jobs:
./build.sh
- name: Build binary wheels
run: |
python setup.py bdist_wheel
pip wheel -e . -w dist/
- name: Upload binary wheel artifact
uses: actions/upload-artifact@v2
with:
name: wheel
path: dist/
path: dist/nmigen_yosys-*.whl
- name: Test binary wheels
run: |
pip install dist/*.whl
pip install dist/nmigen_yosys-*.whl
python -m nmigen_yosys --help
upload_wheels:
needs: build
3 changes: 1 addition & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -34,9 +34,8 @@ def long_description():
long_description=long_description(),
license="ISC", # same as Yosys
python_requires="~=3.5",
setup_requires=["setuptools_scm", "wheel"],
install_requires=[
"importlib_resources>=1.4; python_version<'3.7'",
"importlib_resources>=1.4; python_version<'3.9'",
"wasmtime>=0.30,<0.31"
],
packages=["nmigen_yosys"],