From c549d63ecab60544833341a868d004e70448d2d2 Mon Sep 17 00:00:00 2001 From: "G. Bomarito" Date: Tue, 29 Oct 2024 17:25:15 -0400 Subject: [PATCH] correctly incrementing version and removing some stale code --- .github/workflows/pypi.yml | 31 ------------------- bingo/__init__.py | 2 +- setup.py | 61 -------------------------------------- 3 files changed, 1 insertion(+), 93 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 371c3940..c9b78392 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -36,7 +36,6 @@ jobs: source-build: needs: pip_build_test name: Build source distribution 📦 - if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest steps: - name: Checkout repository and submodules @@ -79,42 +78,12 @@ jobs: build: needs: pip_build_test name: Build binary distributions 📦 - if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: submodules: recursive - # - name: Set up Python - # uses: actions/setup-python@v5 - # with: - # python-version: 3.12 - # - name: Install cibuildwheel - # run: python -m pip install cibuildwheel==2.21.3 - - # - name: Build wheels - # run: python -m cibuildwheel --output-dir wheelhouse - # # to supply options, put them in 'env', like: - # # env: - # # CIBW_SOME_OPTION: value - # - name: see whats in the wheelhouse - # run: ls wheelhouse - - # - name: Install pypa/build - # run: >- - # python3 -m - # pip install - # build - # --user - # - name: Build a binary wheel and a source tarball - # run: python3 -m build - - # - name: Store the distribution packages - # uses: actions/upload-artifact@v4 - # with: - # name: python-package-distributions - # path: dist/ - uses: pypa/cibuildwheel@v2.21 diff --git a/bingo/__init__.py b/bingo/__init__.py index d32a915e..99117e20 100644 --- a/bingo/__init__.py +++ b/bingo/__init__.py @@ -14,4 +14,4 @@ the License. """ -__version__ = "0.4.2" +__version__ = "0.5.0" diff --git a/setup.py b/setup.py index a069ef88..3a635b1c 100644 --- a/setup.py +++ b/setup.py @@ -32,67 +32,6 @@ def __init__(self, name, sourcedir=""): self.sourcedir = os.path.abspath(sourcedir) -# class CMakeBuild(build_ext): -# def run(self): -# try: -# out = subprocess.check_output(["cmake", "--version"]) -# except OSError: -# warnings.warn( -# "CMake must be installed to build the following extensions: " -# + ", ".join(e.name for e in self.extensions) -# ) -# return - -# if platform.system() == "Windows": -# cmake_version = LooseVersion( -# re.search(r"version\s*([\d.]+)", out.decode()).group(1) -# ) -# if cmake_version < "3.1.0": -# raise RuntimeError("CMake >= 3.1.0 is required on Windows") - -# try: -# for ext in self.extensions: -# self.build_extension(ext) -# except subprocess.SubprocessError: -# warnings.warn("Couldn't install bingocpp") - -# def build_extension(self, ext): -# extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name))) -# cmake_args = [ -# "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir, -# "-DPYTHON_EXECUTABLE=" + sys.executable, -# ] - -# cfg = "Debug" if self.debug else "Release" -# build_args = ["--config", cfg] - -# if platform.system() == "Windows": -# cmake_args += [ -# "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir) -# ] -# if sys.maxsize > 2**32: -# cmake_args += ["-A", "x64"] -# build_args += ["--", "/m"] -# else: -# cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg] -# build_args += ["--", "-j2"] - -# env = os.environ.copy() -# env["CXXFLAGS"] = '{} -DVERSION_INFO=\\"{}\\"'.format( -# env.get("CXXFLAGS", ""), self.distribution.get_version() -# ) -# if not os.path.exists(self.build_temp): -# os.makedirs(self.build_temp) -# subprocess.check_call( -# ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env -# ) -# subprocess.check_call( -# ["cmake", "--build", ".", "--target", "bingocpp"] + build_args, -# cwd=self.build_temp, -# ) -# print() # Add an empty line for cleaner output - - class CMakeBuild(build_ext): def build_extension(self, ext: CMakeExtension) -> None: # Must be in this form due to bug in .resolve() only fixed in Python 3.10+