-
Notifications
You must be signed in to change notification settings - Fork 23
1519 memilio-simulation PyPI package #1495
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
Open
annawendler
wants to merge
74
commits into
main
Choose a base branch
from
memilio-simulations-pypi-package
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
74 commits
Select commit
Hold shift + click to select a range
24f1e7c
building source distribution works
annawendler 4677483
try building wheels with ci
annawendler fe6706c
[ci skip] try only ubuntu
annawendler 6b35ba7
test
annawendler 369342f
require higher pybind version
annawendler c13105f
add comma
annawendler e25c218
skip some pypy versions
annawendler 69a5b96
skip all pypy versions
annawendler 73a7fbc
skip musllinux
annawendler 6ca71df
fix
annawendler 265a58c
test windows
annawendler 22c73cb
skip win32
annawendler 02edbf2
test macos
annawendler a1d4085
skip macosx_arm64
annawendler 59e454a
test
annawendler b4febe3
test
annawendler 6f2ac0a
build sdist in ci
annawendler 4b9ce8d
add names for artifacts
annawendler 9747c8c
also include other python packages
annawendler 77bab93
update
annawendler d5b9b27
only windows
annawendler 6951691
fix typo
annawendler c8253b1
test upload
annawendler 682490b
typo
annawendler 47cd7d3
use token
annawendler 2dd392f
adapt names, no token
annawendler 55911ce
try only downloading artifacts
annawendler 0700ae8
try again
annawendler 881d5e6
try with new version
annawendler f7e54c8
Merge branch 'main' into memilio-simulations-pypi-package
annawendler 58979cd
update after merge of main
annawendler 5376644
only ubuntu
annawendler 8c03007
more cpp versions
annawendler b1d43b1
update path
annawendler 9f2e52b
Merge branch 'main' into memilio-simulations-pypi-package
annawendler 80b08ce
update version
annawendler ed25c02
include windows
annawendler c3af9ce
update actions for newer node.js version
annawendler 21f9983
again
annawendler eacb371
try dynamic versioning
annawendler c2df595
try again
annawendler bd64248
no local version
annawendler 2a982eb
general clean up
annawendler a3e2557
update main ci, fix version for now
annawendler 5b19727
fix typo in if statement
annawendler 9f37563
update ci and link to logo
annawendler ed9f054
update paths
annawendler 15ed20f
again
annawendler 40108ff
update
annawendler 7131d9e
again
annawendler 701aa3d
adapt else
annawendler 3a79e46
again
annawendler fd247a1
adapt path for storing wheels
annawendler 969ec6c
try new version to test image
annawendler c92fbf6
Merge branch 'main' into memilio-simulations-pypi-package
annawendler 13a1ea2
prepare for upload to real pypi
annawendler b12999b
add static version for pr
annawendler d60e0b5
fix mpl backend
annawendler b0fa0b8
Merge branch 'main' into memilio-simulations-pypi-package
annawendler 39c7dbe
debug pip env
annawendler e8f51a8
remove qt bindings
annawendler 0eb295f
update
annawendler 4b6c310
again
annawendler 7568f83
try again
annawendler b4dd576
other version
annawendler a37e771
reset epidata_main and action to previous state
annawendler 1acecee
reintroduce if statements
annawendler a91d67c
install setuptools again
annawendler cf93027
install setuptools only for memilio-simulation
annawendler 7dd3357
forgot if statement
annawendler 27bb822
fix order
annawendler 37b0233
review suggestions, test changes on test pypi
annawendler 27e4ba7
update workflow according to review
annawendler 9ab4c4f
update classifiers and readthedocs
annawendler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: PyPI | ||
|
|
||
| # on: | ||
| # release: | ||
| # types: | ||
| # - published | ||
| # remove following line before merge: | ||
| on: [pull_request, release] | ||
|
|
||
| jobs: | ||
|
|
||
| build_wheels: | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: pypa/[email protected] | ||
|
|
||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cibw-wheels-${{ matrix.os }} | ||
| path: ./wheelhouse/*.whl | ||
|
|
||
| build_sdist: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - run: pipx run build --sdist | ||
|
|
||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cibw-sdist | ||
| path: dist/*.tar.gz | ||
|
|
||
| upload_pypi: | ||
| needs: [build_wheels, build_sdist] | ||
| runs-on: ubuntu-latest | ||
| environment: pypi | ||
| permissions: | ||
| id-token: write | ||
|
|
||
| steps: | ||
| - uses: actions/download-artifact@v4 | ||
| with: | ||
| # unpacks all CIBW artifacts into dist/ | ||
| pattern: cibw-* | ||
| path: dist | ||
| merge-multiple: true | ||
|
|
||
| - uses: pypa/gh-action-pypi-publish@release/v1 | ||
| with: | ||
| skip-existing: true | ||
| # To test uploads to TestPyPI, uncomment the following: | ||
| repository-url: https://test.pypi.org/legacy/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| cmake_minimum_required(VERSION 3.14) | ||
| project(memilio-simulation) | ||
|
|
||
| set(CMAKE_CXX_STANDARD "20") | ||
| set(CMAKE_CXX_STANDARD_REQUIRED "20") | ||
|
|
||
| # add in C++ library | ||
| add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cpp ${CMAKE_CURRENT_BINARY_DIR}/cpp EXCLUDE_FROM_ALL) | ||
|
|
||
| add_subdirectory(pycode/memilio-simulation) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,67 @@ | ||
| [project] | ||
| name = "memilio-simulation" | ||
| dynamic = ["version"] | ||
| # remove following line before merge: | ||
| # version = "2.3.0" | ||
|
Comment on lines
+4
to
+5
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. rm later |
||
| description = "Part of MEmilio project, Python bindings to the C++ libraries that contain the models and simulations." | ||
| readme = "README.md" | ||
| requires-python = ">=3.8" | ||
| license = "Apache-2.0" | ||
| authors = [{ name = "MEmilio Team" }] | ||
| maintainers = [ | ||
| { email = "[email protected]" } | ||
| ] | ||
| dependencies = [ | ||
| # smaller numpy versions cause a security issue, 1.25 does not work together with pyfakefs | ||
| "numpy>=1.22,!=1.25.*", | ||
| # smaller pandas versions contain a bug that sometimes prevents reading | ||
| "pandas>=2.0.0" | ||
| ] | ||
| classifiers = [ | ||
| "Development Status :: 5 - Production/Stable", | ||
| "Natural Language :: English", | ||
| "Programming Language :: Python :: 3", | ||
| "Programming Language :: Python :: 3.8", | ||
| "Programming Language :: Python :: 3.9", | ||
| "Programming Language :: Python :: 3.10", | ||
| "Programming Language :: Python :: 3.11", | ||
| "Programming Language :: Python :: 3.12", | ||
| "Programming Language :: Python :: 3.13", | ||
| "Operating System :: POSIX :: Linux", | ||
| "Operating System :: Microsoft :: Windows" | ||
| ] | ||
|
|
||
| [project.optional-dependencies] | ||
| dev = [] | ||
|
|
||
| [project.urls] | ||
| Homepage = "https://github.com/SciCompMod/memilio" | ||
| Team = "https://memilio.readthedocs.io/en/latest/team.html" | ||
|
|
||
| [build-system] | ||
| requires = [ | ||
| "scikit-build-core>=0.9.0", | ||
| "setuptools>=68", | ||
| "setuptools-scm>=8", | ||
| "wheel" | ||
| ] | ||
| build-backend = "scikit_build_core.build" | ||
|
|
||
| [tool.scikit-build] | ||
| cmake.version = ">=3.13" | ||
| cmake.args = ["-DMEMILIO_BUILD_SHARED_LIBS:BOOL=ON"] | ||
| wheel.packages = ["pycode/memilio-simulation/memilio"] | ||
| wheel.install-dir = "memilio/simulation" | ||
| build-dir = "pycode/build/memilio-simulation" | ||
| metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" | ||
|
|
||
| [tool.setuptools_scm] | ||
| local_scheme = "no-local-version" | ||
|
|
||
| [tool.cibuildwheel] | ||
| # Disable some wheels | ||
| skip = ["pp*", "*musllinux*", "*-win32"] | ||
|
|
||
| [tool.autopep8] | ||
| max-line-length = 79 | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.