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.

Sign up for GitHub

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

Update dependencies #1369

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Update dependencies #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e32c21
Update dependencies
Ozaq Apr 4, 2024
9695ea1
Update black / python version
Ozaq Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 8 additions & 8 deletions .github/workflows/cibuildwheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Install dependencies
run: pip install black==24.1.1 isort==5.13.2 jupyter-black==0.3.4
run: pip install black==24.4.0 isort==5.13.2 jupyter-black==0.3.4

- name: Run checks
run: ./scripts/ci/check_format.sh
Expand All @@ -43,10 +43,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Install dependencies
run: pip install -r requirements.txt

Expand All @@ -63,10 +63,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install jupedsim
run: |
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: 3.11
python-version: 3.12

- name: Install dependencies
run: python -m pip install wheel build setuptools
Expand Down
3 changes: 2 additions & 1 deletion python_bindings_jupedsim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ add_library(py_jupedsim MODULE
target_link_libraries(py_jupedsim
PRIVATE
pybind11::module
pybind11::lto
pybind11::windows_extras
fmt::fmt
jupedsim_obj
Expand All @@ -41,5 +40,7 @@ set_target_properties(py_jupedsim
PROPERTIES
CXX_VISIBILITY_PRESET "hidden"
CUDA_VISIBILITY_PRESET "hidden"
INTERPROCEDURAL_OPTIMIZATION ${USE_IPO}
INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF
)

2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ pandas~=2.1

# ci deps
jinja2
black==24.1.1
black==24.4.0
jupyter-black==0.3.4
isort==5.13.2
11 changes: 7 additions & 4 deletions third-party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# libfmt
################################################################################
set(FMT_INSTALL OFF)
add_subdirectory(fmt-10.1.1)
add_subdirectory(fmt-10.2.1)
set_target_properties(fmt PROPERTIES
POSITION_INDEPENDENT_CODE ON
SYSTEM ON
Expand Down Expand Up @@ -37,15 +37,18 @@ find_package(CGAL 5.5
CONFIG
NO_DEFAULT_PATH
PATHS
${CMAKE_CURRENT_SOURCE_DIR}/cgal-5.6.0
${CMAKE_CURRENT_SOURCE_DIR}/cgal-5.6.1
)

################################################################################
# Python Interpreter / CPython
################################################################################
set(Python_FIND_VIRTUALENV "FIRST")
find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
add_subdirectory(pybind11-2.11.1)
set(PYBIND11_SIMPLE_GIL_MANAGEMENT ON)
set(PYBIND11_NUMPY_1_ONLY ON)
set(PYBIND11_FINDPYTHON ON)
add_subdirectory(pybind11-2.12.0)
set(Python_EXECUTABLE ${Python_EXECUTABLE} PARENT_SCOPE)

################################################################################
Expand All @@ -70,4 +73,4 @@ endif ()
# glm
################################################################################
set(GLM_ENABLE_CXX_20 ON CACHE BOOL "" FORCE)
add_subdirectory(glm-1.0.0)
add_subdirectory(glm-1.0.1)
Loading
Loading