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

Fix pypi upload #1270

Merged
merged 4 commits into from
Oct 25, 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
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.
4 changes: 2 additions & 2 deletions .github/workflows/cibuildwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ jobs:
uses: actions/Download-artifact@v3
with:
name: python-packages
path: dist

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: python-packages

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Project setup
################################################################################
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
project(JuPedSim VERSION 1.0.3 LANGUAGES CXX)
project(JuPedSim VERSION 1.0.4 LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -107,7 +107,7 @@ find_package(CGAL 5.5
CONFIG
NO_DEFAULT_PATH
PATHS
${CMAKE_SOURCE_DIR}/third-party/cgal-5.5.2
${CMAKE_SOURCE_DIR}/third-party/cgal-5.6.0
)

add_subdirectory(third-party/poly2tri)
Expand Down
2 changes: 1 addition & 1 deletion libsimulator/src/CollisionGeometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ template <>
struct std::hash<Cell> {
std::size_t operator()(const Point& pos) const noexcept
{
std::hash<std::int32_t> hasher{};
std::hash<double> hasher{};
return jps::hash_combine(hasher(pos.x), hasher(pos.y));
}
};
Expand Down
5 changes: 0 additions & 5 deletions third-party/cgal-5.5.2/.clang-tidy

This file was deleted.

104 changes: 0 additions & 104 deletions third-party/cgal-5.5.2/.gitattributes

This file was deleted.

6 changes: 0 additions & 6 deletions third-party/cgal-5.5.2/.github/CONTRIBUTING.md

This file was deleted.

19 changes: 0 additions & 19 deletions third-party/cgal-5.5.2/.github/ISSUE_TEMPLATE.md

This file was deleted.

14 changes: 0 additions & 14 deletions third-party/cgal-5.5.2/.github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

11 changes: 0 additions & 11 deletions third-party/cgal-5.5.2/.github/install.sh

This file was deleted.

13 changes: 0 additions & 13 deletions third-party/cgal-5.5.2/.github/test.sh

This file was deleted.

145 changes: 0 additions & 145 deletions third-party/cgal-5.5.2/.github/workflows/build_doc.yml

This file was deleted.

30 changes: 0 additions & 30 deletions third-party/cgal-5.5.2/.github/workflows/checks.yml

This file was deleted.

Loading