From 1d5f23e27b37a61d9efe750d1f0fb48ae20b117f Mon Sep 17 00:00:00 2001 From: b-long <(none)> Date: Mon, 22 Jul 2024 15:12:31 -0400 Subject: [PATCH] Use cibuildwheel --- .github/workflows/build-golang-macos.yaml | 2 +- .github/workflows/publish.yml | 26 ++++++++++++----------- README.md | 2 +- make_and_validate_script.sh | 2 +- only_validate.sh | 2 +- pyproject.toml | 2 +- setup.py | 2 +- setup_ci.py | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-golang-macos.yaml b/.github/workflows/build-golang-macos.yaml index 52d0445..7769b54 100644 --- a/.github/workflows/build-golang-macos.yaml +++ b/.github/workflows/build-golang-macos.yaml @@ -100,7 +100,7 @@ jobs: - name: Test Python wheel run: | # Test wheel installation - pip install dist/ohpygossh-0.0.8-py3-none-any.whl + pip install dist/ohpygossh-0.0.9-py3-none-any.whl # Test wheel functionality python3 validate_ohpygossh.py diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c8edc09..865af00 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -83,13 +83,14 @@ jobs: brew install vagrant vagrant --version - - name: Test Python wheel - run: | - # Test wheel installation - /usr/local/bin/python_for_build -m pip install wheelhouse/*.whl + # FIXME: Test before uploading + # - name: Test Python wheel + # run: | + # # Test wheel installation + # /usr/local/bin/python_for_build -m pip install wheelhouse/*.whl - # Test wheel functionality - /usr/local/bin/python_for_build validate_ohpygossh.py + # # Test wheel functionality + # /usr/local/bin/python_for_build validate_ohpygossh.py - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -137,13 +138,14 @@ jobs: docker ps vagrant --version - - name: Test Python wheel - run: | - # Test wheel installation - python3 -m pip install wheelhouse/*.whl + # FIXME: Test before uploading + # - name: Test Python wheel + # run: | + # # Test wheel installation + # python3 -m pip install wheelhouse/*.whl - # Test wheel functionality - python3 validate_ohpygossh.py + # # Test wheel functionality + # python3 validate_ohpygossh.py - name: Upload atifacts uses: actions/upload-artifact@v4 diff --git a/README.md b/README.md index 9c9e846..933cfe8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ and/or cause debate without offerinig solutions. ## Build wheel The following steps should produce a wheel, -located at `dist/ohpygossh-0.0.8-py3-none-any.whl` +located at `dist/ohpygossh-0.0.9-py3-none-any.whl` ```bash ./make_and_validate_script.sh diff --git a/make_and_validate_script.sh b/make_and_validate_script.sh index 211a3f7..51fcee3 100755 --- a/make_and_validate_script.sh +++ b/make_and_validate_script.sh @@ -39,7 +39,7 @@ python3 -m pip install --upgrade setuptools wheel python3 setup.py bdist_wheel # Prove that the wheel can be installed -pip install dist/ohpygossh-0.0.8-py3-none-any.whl +pip install dist/ohpygossh-0.0.9-py3-none-any.whl # Validate functionality python3 validate_ohpygossh.py diff --git a/only_validate.sh b/only_validate.sh index 8f2741b..9c17a0d 100755 --- a/only_validate.sh +++ b/only_validate.sh @@ -30,7 +30,7 @@ fi source .venv/bin/activate # Prove that the wheel can be installed -pip install dist/ohpygossh-0.0.8-py3-none-any.whl +pip install dist/ohpygossh-0.0.9-py3-none-any.whl # Validate functionality python validate_ohpygossh.py diff --git a/pyproject.toml b/pyproject.toml index 512daa2..15ccae7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "gohpygossh" # Should match 'setup.py' version number (used for gopy/pybindgen) -version = "0.0.8" +version = "0.0.9" description = "" authors = ["b-long "] readme = "README.md" diff --git a/setup.py b/setup.py index e42d625..9903172 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,6 @@ py_modules = ["ohpygossh.gohpygossh"], package_data={"ohpygossh": ["*.so"]}, # Should match 'pyproject.toml' version number - version="0.0.8", + version="0.0.9", include_package_data=True, ) diff --git a/setup_ci.py b/setup_ci.py index 562c47c..6fe8ba8 100644 --- a/setup_ci.py +++ b/setup_ci.py @@ -68,7 +68,7 @@ def build_extension(self, ext: Extension): setuptools.setup( name="ohpygossh", - version="0.0.8", + version="0.0.9", author="b-long", description="A project to create a new cross-platform SSH wheel for Python.", url="https://github.com/b-long/ohpygossh",