From d1aced36695166f2017bb858e4a0783743f7b4a4 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Fri, 20 Dec 2024 14:27:06 +0000 Subject: [PATCH] clean up --- .github/workflows/build-wheels-push.yml | 4 ++-- BUILD.bazel | 19 +------------------ pyproject.toml | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index a3e90bfcb2..751eb1c83f 100644 --- a/.github/workflows/build-wheels-push.yml +++ b/.github/workflows/build-wheels-push.yml @@ -116,8 +116,8 @@ jobs: runs-on: ubuntu-latest needs: [build_wheels, build_sdist] - # upload to pypi on every tag starting with 'v' - if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') + # upload to PyPI on every tag starting with 'v' + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') environment: name: pypi diff --git a/BUILD.bazel b/BUILD.bazel index 1a9e39bff9..1927d5e919 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -117,16 +117,6 @@ cc_library( ], ) -# config_setting( -# name = "on_windows", -# constraint_values = ["@platforms//os:windows"], -# ) - -# config_setting( -# name = "on_linux", -# constraint_values = ["@platforms//os:linux"], -# ) - TEST_NAMES = [ "TestAlienBasis", "TestBasis", @@ -166,13 +156,7 @@ TEST_NAMES = [ "TestSort", "TestSpecialLps", "TestThrow", -] - -# PLATFORM_DEPENDENT_TESTS = select({ -# "on_linux": ["TestLpSolvers.cpp"], -# "on_windows": ["TestLpSolvers.cpp"], -# "//conditions:default": [], -# }) +] [cc_test( name = name, @@ -187,4 +171,3 @@ TEST_NAMES = [ ":test_lib", ], ) for name in TEST_NAMES] - diff --git a/pyproject.toml b/pyproject.toml index 8db4758f3b..0d45e2c031 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ "Bug Tracker" = "https://github.com/ERGO-Code/HiGHS/issues" [build-system] -requires = ["numpy", "pybind11", "scikit-build-core>=0.3.3"] +requires = ["scikit-build-core>=0.3.3", "pybind11", "numpy"] build-backend = "scikit_build_core.build" [project] @@ -54,9 +54,9 @@ sdist.include = [ "LICENSE", "README.md", "src/HConfig.h.in", - "src/", - "external/", - "cmake/", + "src", + "external", + "cmake", ] sdist.exclude = [ @@ -64,11 +64,11 @@ sdist.exclude = [ ".gitattributes", ".gitignore", ".github", - "app/", - "build/", - "check/", - "docs/", - "subprojects/", + "app", + "build", + "check", + "docs", + "subprojects", ".coin-or", "build_webdemo.sh", ".clang-format", @@ -98,11 +98,11 @@ sdist.exclude = [ # # The versions of Ninja to allow. If Ninja is not present on the system or does # # not pass this specifier, it will be downloaded via PyPI if possible. An empty # # string will disable this check. -ninja.version = ">=1.5" +# ninja.version = ">=1.5" # # If Ninja is not present on the system or is older required, it will be # # downloaded via PyPI if possible. An empty string will disable this check. -ninja.make-fallback = true +# ninja.make-fallback = true # # The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are # # possible options.