amaranth-lang · Nov 5, 2021
Showing with 4 additions and 6 deletions.

+3 −4 .github/workflows/main.yml

+1 −2 setup.py
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,6 @@ jobs:
         uses: actions/setup-python@v2
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip setuptools setuptools_scm wheel
           sudo apt-get install flex bison ccache
       - name: Set up ccache
         uses: actions/cache@v1
@@ -26,15 +25,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

diff --git a/setup.py b/setup.py
@@ -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"],