Skip to content

Commit

Permalink
Update package requirements - need to update the setup.py files next
Browse files Browse the repository at this point in the history
  • Loading branch information
rieder committed May 17, 2023
1 parent a60b459 commit baba14a
Show file tree
Hide file tree
Showing 49 changed files with 91 additions and 86 deletions.
2 changes: 1 addition & 1 deletion packages/amuse-aarsethzare/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-athena/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-bhtree/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-brutus/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-bse/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-capreole/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-distributed/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-evtwin/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-fastkick/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-fi/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-fractalcluster/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-framework/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools>=42.0.0", "setuptools_scm", "pip>=19.0.0", "wheel", "docutils", "numpy", "nose", "h5py", "pytest" ]
requires = ["setuptools>=65.0.0", "setuptools_scm>=6", "pip>=21.0.0", "wheel", "docutils", "numpy", "h5py>=3.0", "pytest>=3.0"]
8 changes: 4 additions & 4 deletions packages/amuse-framework/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
]
}

mapping_from_command_name_to_command_class=setup_commands()
mapping_from_command_name_to_command_class = setup_commands()

try:
from src.amuse.version import version
Expand Down Expand Up @@ -67,14 +67,14 @@
long_description_content_type=long_description_content_type,
install_requires=install_requires,
python_requires=">=3.7",
extras_require = {
"MPI" : ["mpi4py>=1.1.0"]
extras_require={
"MPI": ["mpi4py>=1.1.0"]
},
cmdclass=mapping_from_command_name_to_command_class,
ext_modules=extensions,
package_dir={'': 'src'},
packages=packages,
package_data=package_data,
data_files=all_data_files,
scripts=[ "bin/amusifier" ],
scripts=["bin/amusifier", ],
)
2 changes: 1 addition & 1 deletion packages/amuse-gadget2/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-galactics/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-galaxia/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-halogen/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-hermite/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-hop/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-huayno/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-kepler-orbiters/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-kepler/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mameclot/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mercury/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mesa-r15140/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mesa-r2208/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mesa/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mikkola/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mmams/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mobse/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-mosse/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-petar/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-ph4/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-phantom/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-phigrape/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-seba/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-secularmultiple/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-simplex/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-smalln/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-sphray/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-sse/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
4 changes: 1 addition & 3 deletions packages/amuse-tests/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
[build-system]
requires = [
"setuptools", "wheel", "amuse-framework",
]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
8 changes: 1 addition & 7 deletions packages/amuse-tutorial/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
[build-system]
requires = [
'amuse-framework>=13.0.0',
'amuse-bhtree>=13.0.0',
'amuse-sse>=13.0.0',
'notebook',
'matplotlib'
]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-twobody/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
2 changes: 1 addition & 1 deletion packages/amuse-vader/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = [ "setuptools", "wheel", "amuse-framework" ]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]
60 changes: 30 additions & 30 deletions packages/amuse/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
[build-system]
requires = [
'amuse-framework[MPI]>=2021.7.0',
'amuse-athena>=2021.7.0',
'amuse-bhtree>=2021.7.0',
# 'amuse-brutus>=2021.7.0',
'amuse-bse>=2021.7.0',
'amuse-capreole>=2021.7.0',
'amuse-evtwin>=2021.7.0',
'amuse-fastkick>=2021.7.0',
'amuse-fi>=2021.7.0',
'amuse-fractalcluster>=2021.7.0',
'amuse-gadget2>=2021.7.0',
'amuse-galactics>=2021.7.0',
'amuse-galaxia>=2021.7.0',
'amuse-halogen>=2021.7.0',
'amuse-hermite>=2021.7.0',
'amuse-hop>=2021.7.0',
'amuse-huayno>=2021.7.0',
'amuse-kepler>=2021.7.0',
'amuse-kepler-orbiters>=2021.7.0',
'amuse-mameclot>=2021.7.0',
'amuse-mercury>=2021.7.0',
'amuse-mmams>=2021.7.0',
'amuse-ph4>=2021.7.0',
'amuse-seba>=2021.7.0',
'amuse-secularmultiple>=2021.7.0',
'amuse-simplex>=2021.7.0',
'amuse-smalln>=2021.7.0',
'amuse-sphray>=2021.7.0',
'amuse-sse>=2021.7.0',
'amuse-twobody>=2021.7.0',
'amuse-framework[MPI]>=2023.5.0',
'amuse-athena>=2023.5.0',
'amuse-bhtree>=2023.5.0',
# 'amuse-brutus>=2023.5.0',
'amuse-bse>=2023.5.0',
'amuse-capreole>=2023.5.0',
'amuse-evtwin>=2023.5.0',
'amuse-fastkick>=2023.5.0',
'amuse-fi>=2023.5.0',
'amuse-fractalcluster>=2023.5.0',
'amuse-gadget2>=2023.5.0',
'amuse-galactics>=2023.5.0',
'amuse-galaxia>=2023.5.0',
'amuse-halogen>=2023.5.0',
'amuse-hermite>=2023.5.0',
'amuse-hop>=2023.5.0',
'amuse-huayno>=2023.5.0',
'amuse-kepler>=2023.5.0',
'amuse-kepler-orbiters>=2023.5.0',
'amuse-mameclot>=2023.5.0',
'amuse-mercury>=2023.5.0',
'amuse-mmams>=2023.5.0',
'amuse-ph4>=2023.5.0',
'amuse-seba>=2023.5.0',
'amuse-secularmultiple>=2023.5.0',
'amuse-simplex>=2023.5.0',
'amuse-smalln>=2023.5.0',
'amuse-sphray>=2023.5.0',
'amuse-sse>=2023.5.0',
'amuse-twobody>=2023.5.0',
]
4 changes: 4 additions & 0 deletions packages/community_package_names
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Kepler-orbiters
Mameclot
Mercury
Mikkola
MESA
MESA-r2208
MESA-r15140
MMAMS
MOBSE
MOSSE
Expand All @@ -37,3 +40,4 @@ SSE
tests
tutorial
twobody
Vader
7 changes: 7 additions & 0 deletions packages/generate_pyproject_toml_files.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

while read -r line; do
pkgdir=$(echo "print('amuse-${line}'.lower())" | python);
echo ${pkgdir}
cp pyproject.toml_template ${pkgdir}/pyproject.toml;
done < community_package_names
2 changes: 2 additions & 0 deletions packages/pyproject.toml_template
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build-system]
requires = ["setuptools>=65.0.0", "wheel>=0.30", "amuse-framework>2023.5.0"]

0 comments on commit baba14a

Please sign in to comment.