Skip to content

Commit

Permalink
correctly incrementing version and removing some stale code
Browse files Browse the repository at this point in the history
  • Loading branch information
gbomarito committed Oct 29, 2024
1 parent 8c63055 commit c549d63
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 93 deletions.
31 changes: 0 additions & 31 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion bingo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
the License.
"""

__version__ = "0.4.2"
__version__ = "0.5.0"
61 changes: 0 additions & 61 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down

0 comments on commit c549d63

Please sign in to comment.