diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c00a3a..558cfbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: yum install aria2 -y rm -f /usr/bin/python /bin/python ln -s ${{ matrix.python-exec }} /usr/bin/python + python -m pip install -r requirements.txt /work/tools/Linux/dist_script.sh - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: @@ -130,6 +131,7 @@ jobs: - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: python-version: ${{ matrix.python-version }} + - run: python -m pip install -r requirements.txt - run: dist_script_native.cmd - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: @@ -156,6 +158,7 @@ jobs: - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - run: update_dev_environment.cmd + - run: python -m pip install -r requirements.txt - run: dist_script.cmd - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: @@ -210,24 +213,24 @@ jobs: - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: python-version: '3.12' - - run: python -m pip install patchelf auditwheel + - run: python -m pip install -r dev-requirements.txt - run: python ./tools/auditwheel_.py repair --plat manylinux_2_28_x86_64 linux_3.12/dist/stlib-*cp312*.whl - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: python-version: '3.11' - - run: python -m pip install patchelf auditwheel + - run: python -m pip install -r dev-requirements.txt - run: python ./tools/auditwheel_.py repair --plat manylinux_2_28_x86_64 linux_3.11/dist/stlib-*cp311*.whl - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: python-version: '3.10' - - run: python -m pip install patchelf auditwheel + - run: python -m pip install -r dev-requirements.txt - run: python ./tools/auditwheel_.py repair --plat manylinux_2_28_x86_64 linux_3.10/dist/stlib-*cp310*.whl #- run: python ./tools/auditwheel_.py repair --plat manylinux2014_armv7l rpi_armv7/dist/stlib-*cp310*.whl #- run: python ./tools/auditwheel_.py repair --plat manylinux2014_aarch64 rpi_aarch64/dist/stlib-*cp310*.whl - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: python-version: '3.9' - - run: python -m pip install patchelf auditwheel + - run: python -m pip install -r dev-requirements.txt - run: python ./tools/auditwheel_.py repair --plat manylinux_2_28_x86_64 linux_3.9/dist/stlib-*cp39*.whl - run: mv windows_3.9/dist/stlib-*win_amd64.whl wheelhouse/ - run: mv windows_3.10/dist/stlib-*win_amd64.whl wheelhouse/ diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1b946a7..d04e240 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -58,7 +58,7 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. - run: | - python -m pip install build + python -m pip install -r dev-requirements.txt ./tools/Linux/dist_script.sh - name: Perform CodeQL Analysis diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7c2b50c..258e402 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: python-version: ${{ matrix.python-version }} - run: ./tools/Linux/dist_script.sh - run: python -m pip install dist/*.whl -v - - run: python -m pip install -r requirements_dev.txt + - run: python -m pip install -r dev-requirements.txt - name: Prevent exceeding steam rate limits (waiting 30s) run: sleep 30s - run: pytest --cov=stlib --cov-report=xml diff --git a/requirements_dev.txt b/dev-requirements.txt similarity index 90% rename from requirements_dev.txt rename to dev-requirements.txt index c953c47..874d615 100644 --- a/requirements_dev.txt +++ b/dev-requirements.txt @@ -5,4 +5,3 @@ pdoc~=14.1 pytest~=7.4 pytest-asyncio~=0.21 pytest-cov~=4.1 -build~=1.0 diff --git a/requirements.txt b/requirements.txt index 3c9173b..e7a3535 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ aiohttp~=3.8 beautifulsoup4~=4.12 rsa==4.9 setuptools~=68.2 +build~=1.0 diff --git a/tools/Linux/dist_script.sh b/tools/Linux/dist_script.sh index dd72555..e1acb8a 100755 --- a/tools/Linux/dist_script.sh +++ b/tools/Linux/dist_script.sh @@ -27,7 +27,6 @@ unzip -o steamworks-sdk.zip || exit 1 popd || exit 1 # build project -python -m pip install build || exit 1 python -m build --sdist --wheel || exit 1 pushd build || exit 1 mv "lib.linux-x86_64-$PYTHON_VERSION" "$RELEASE_NAME" || exit 1 diff --git a/tools/MSYS/dist_script.sh b/tools/MSYS/dist_script.sh index 3de1f12..0ab8796 100644 --- a/tools/MSYS/dist_script.sh +++ b/tools/MSYS/dist_script.sh @@ -27,7 +27,6 @@ unzip -o steamworks-sdk.zip || exit 1 popd || exit 1 # build project -python -m pip install build || exit 1 python -m build --sdist --wheel --no-isolation || exit 1 pushd build || exit 1 mv "lib.mingw_x86_64-$PYTHON_VERSION" "$RELEASE_NAME" || exit 1