Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove setuptools<64 restriction #2180

Merged
merged 4 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_python_cplusplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
-d ${AMICI_DIR}/build/CMakeFiles/amici.dir/src \
-b ${AMICI_DIR} -c -o coverage_cpp.info \
&& lcov --compat-libtool --no-external \
-d ${AMICI_DIR}/python/sdist/build/$(python -c "import sys, sysconfig; print(f'temp.{sysconfig.get_platform()}-{sys.implementation.cache_tag}_amici')")/CMakeFiles/amici.dir/src \
-d ${AMICI_DIR}/python/sdist/build/temp_amici/CMakeFiles/amici.dir/src \
-b ${AMICI_DIR}/python/sdist -c -o coverage_py.info \
&& lcov -a coverage_cpp.info -a coverage_py.info -o coverage.info

Expand Down
10 changes: 10 additions & 0 deletions python/sdist/amici/custom_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,16 @@


class AmiciBuildCMakeExtension(BuildExtension):
def finalize_options(self):
# Allow overriding the - since setuptools version 64 randomly named -
# setuptools/distutils temporary build directory via environment variable.
# This is useful for CI builds where we need the files in this directory
# for code coverage analysis.
if os.getenv("AMICI_BUILD_TEMP"):
self.build_temp = os.getenv("AMICI_BUILD_TEMP")

Check warning on line 135 in python/sdist/amici/custom_commands.py

View check run for this annotation

Codecov / codecov/patch

python/sdist/amici/custom_commands.py#L135

Added line #L135 was not covered by tests

super().finalize_options()

def run(self):
"""Copy the generated clibs to the extensions folder to be included in
the wheel
Expand Down
3 changes: 1 addition & 2 deletions scripts/installAmiciSource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ else
source ${AMICI_PATH}/build/venv/bin/activate
fi

pip install -U "setuptools<64"
pip install --upgrade pip wheel
pip install --upgrade pip scipy matplotlib coverage pytest \
pytest-cov cmake_build_extension numpy
pip install git+https://github.com/FFroehlich/pysb@fix_pattern_matching # pin to PR for SPM with compartments
pip install --verbose -e ${AMICI_PATH}/python/sdist[petab,test,vis] --no-build-isolation
AMICI_BUILD_TEMP="${AMICI_PATH}/python/sdist/build/temp" pip install --verbose -e ${AMICI_PATH}/python/sdist[petab,test,vis] --no-build-isolation
deactivate