From 39b4106d8103d0d823d7be091e38d5469e5892d1 Mon Sep 17 00:00:00 2001 From: Steven Rieder Date: Thu, 5 Oct 2023 10:02:18 +0200 Subject: [PATCH] Update setup version (#992) * update setup files * update literature.py --- .gitignore | 6 ++++-- packages/amuse-aarsethzare/setup.py | 21 +++++++-------------- packages/amuse-athena/setup.py | 21 +++++++-------------- packages/amuse-bhtree/setup.py | 21 +++++++-------------- packages/amuse-brutus/setup.py | 21 +++++++-------------- packages/amuse-bse/setup.py | 21 +++++++-------------- packages/amuse-capreole/setup.py | 21 +++++++-------------- packages/amuse-distributed/setup.py | 21 +++++++-------------- packages/amuse-evtwin/setup.py | 21 +++++++-------------- packages/amuse-fastkick/setup.py | 21 +++++++-------------- packages/amuse-fi/setup.py | 21 +++++++-------------- packages/amuse-fractalcluster/setup.py | 21 +++++++-------------- packages/amuse-framework/setup.py | 19 ++++++------------- packages/amuse-gadget2/setup.py | 21 +++++++-------------- packages/amuse-galactics/setup.py | 21 +++++++-------------- packages/amuse-galaxia/setup.py | 21 +++++++-------------- packages/amuse-halogen/setup.py | 21 +++++++-------------- packages/amuse-hermite/setup.py | 21 +++++++-------------- packages/amuse-hop/setup.py | 21 +++++++-------------- packages/amuse-huayno/setup.py | 21 +++++++-------------- packages/amuse-kepler-orbiters/setup.py | 21 +++++++-------------- packages/amuse-kepler/setup.py | 21 +++++++-------------- packages/amuse-mameclot/setup.py | 21 +++++++-------------- packages/amuse-mercury/setup.py | 21 +++++++-------------- packages/amuse-mesa-r15140/setup.py | 19 ++++++------------- packages/amuse-mesa-r2208/setup.py | 19 ++++++------------- packages/amuse-mesa/setup.py | 19 ++++++------------- packages/amuse-mikkola/setup.py | 21 +++++++-------------- packages/amuse-mmams/setup.py | 21 +++++++-------------- packages/amuse-mobse/setup.py | 21 +++++++-------------- packages/amuse-mosse/setup.py | 21 +++++++-------------- packages/amuse-nbody6xx/setup.py | 21 +++++++-------------- packages/amuse-petar/setup.py | 21 +++++++-------------- packages/amuse-ph4/setup.py | 21 +++++++-------------- packages/amuse-phantom/setup.py | 21 +++++++-------------- packages/amuse-phigrape/setup.py | 21 +++++++-------------- packages/amuse-seba/setup.py | 21 +++++++-------------- packages/amuse-secularmultiple/setup.py | 21 +++++++-------------- packages/amuse-simplex/setup.py | 21 +++++++-------------- packages/amuse-smalln/setup.py | 21 +++++++-------------- packages/amuse-sphray/setup.py | 21 +++++++-------------- packages/amuse-sse/setup.py | 21 +++++++-------------- packages/amuse-tests/setup.py | 21 +++++++-------------- packages/amuse-tutorial/setup.py | 21 +++++++-------------- packages/amuse-twobody/setup.py | 21 +++++++-------------- packages/amuse-vader/setup.py | 21 +++++++-------------- packages/amuse/setup.py | 20 ++++++-------------- packages/community_package_names | 1 + packages/setup_template.py | 21 +++++++-------------- src/amuse/support/literature.py | 7 ++++--- 50 files changed, 333 insertions(+), 659 deletions(-) diff --git a/.gitignore b/.gitignore index 13df4afaad..0ac1434fb2 100644 --- a/.gitignore +++ b/.gitignore @@ -484,8 +484,10 @@ test_python_sockets_implementation .idea src/amuse/community/bonsai2/src -src/amuse/community/*/version.py -src/amuse/version.py +doc/interactive_tutorial/_version.py +src/amuse/test/suite/_version.py +src/amuse/community/*/_version.py +src/amuse/_version.py src/amuse/community/petar/src src/amuse/community/seba/src packages/amuse*/dist diff --git a/packages/amuse-aarsethzare/setup.py b/packages/amuse-aarsethzare/setup.py index 474aed5967..bd8c584b16 100644 --- a/packages/amuse-aarsethzare/setup.py +++ b/packages/amuse-aarsethzare/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.aarsethzare.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/aarsethzare/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/aarsethzare/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-athena/setup.py b/packages/amuse-athena/setup.py index 0f3b4a8c60..04e24387aa 100644 --- a/packages/amuse-athena/setup.py +++ b/packages/amuse-athena/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.athena.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/athena/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/athena/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-bhtree/setup.py b/packages/amuse-bhtree/setup.py index a60b9d9150..6cfa4f010d 100644 --- a/packages/amuse-bhtree/setup.py +++ b/packages/amuse-bhtree/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.bhtree.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/bhtree/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/bhtree/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-brutus/setup.py b/packages/amuse-brutus/setup.py index 636257ac5a..b454f2b072 100644 --- a/packages/amuse-brutus/setup.py +++ b/packages/amuse-brutus/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.brutus.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/brutus/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/brutus/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-bse/setup.py b/packages/amuse-bse/setup.py index 736378c024..55e97fedd8 100644 --- a/packages/amuse-bse/setup.py +++ b/packages/amuse-bse/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.bse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/bse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/bse/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-capreole/setup.py b/packages/amuse-capreole/setup.py index 7bf47aa028..b76cc5b844 100644 --- a/packages/amuse-capreole/setup.py +++ b/packages/amuse-capreole/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.capreole.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/capreole/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/capreole/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-distributed/setup.py b/packages/amuse-distributed/setup.py index a1546a4c29..cffb28c2c9 100644 --- a/packages/amuse-distributed/setup.py +++ b/packages/amuse-distributed/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.distributed.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/distributed/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/distributed/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-evtwin/setup.py b/packages/amuse-evtwin/setup.py index 0797cd684c..65b282e7f8 100644 --- a/packages/amuse-evtwin/setup.py +++ b/packages/amuse-evtwin/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.evtwin.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/evtwin/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/evtwin/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-fastkick/setup.py b/packages/amuse-fastkick/setup.py index 8d7655b0c9..4c5c235af2 100644 --- a/packages/amuse-fastkick/setup.py +++ b/packages/amuse-fastkick/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.fastkick.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/fastkick/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/fastkick/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-fi/setup.py b/packages/amuse-fi/setup.py index e5d5e64733..e6a47a353c 100644 --- a/packages/amuse-fi/setup.py +++ b/packages/amuse-fi/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.fi.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/fi/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/fi/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-fractalcluster/setup.py b/packages/amuse-fractalcluster/setup.py index c1a0fcdc03..cb607de78b 100644 --- a/packages/amuse-fractalcluster/setup.py +++ b/packages/amuse-fractalcluster/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.fractalcluster.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/fractalcluster/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/fractalcluster/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-framework/setup.py b/packages/amuse-framework/setup.py index ed83ea6980..aff9df54b5 100644 --- a/packages/amuse-framework/setup.py +++ b/packages/amuse-framework/setup.py @@ -40,23 +40,16 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = None - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, diff --git a/packages/amuse-gadget2/setup.py b/packages/amuse-gadget2/setup.py index 6c6d164f9b..891461fa67 100644 --- a/packages/amuse-gadget2/setup.py +++ b/packages/amuse-gadget2/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.gadget2.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/gadget2/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/gadget2/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-galactics/setup.py b/packages/amuse-galactics/setup.py index ec75b00f61..700b8f7ccf 100644 --- a/packages/amuse-galactics/setup.py +++ b/packages/amuse-galactics/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.galactics.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/galactics/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/galactics/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-galaxia/setup.py b/packages/amuse-galaxia/setup.py index 30a7b6b653..54b9c01bb7 100644 --- a/packages/amuse-galaxia/setup.py +++ b/packages/amuse-galaxia/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.galaxia.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/galaxia/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/galaxia/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-halogen/setup.py b/packages/amuse-halogen/setup.py index 7b4e1084b1..a5756d83d0 100644 --- a/packages/amuse-halogen/setup.py +++ b/packages/amuse-halogen/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.halogen.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/halogen/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/halogen/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-hermite/setup.py b/packages/amuse-hermite/setup.py index ebb81b0adf..7cc677c1df 100644 --- a/packages/amuse-hermite/setup.py +++ b/packages/amuse-hermite/setup.py @@ -34,24 +34,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.hermite.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/hermite/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/hermite/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -61,7 +54,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-hop/setup.py b/packages/amuse-hop/setup.py index 8a5f620472..63114f32ba 100644 --- a/packages/amuse-hop/setup.py +++ b/packages/amuse-hop/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.hop.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/hop/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/hop/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-huayno/setup.py b/packages/amuse-huayno/setup.py index 2b6a45df54..58587aad93 100644 --- a/packages/amuse-huayno/setup.py +++ b/packages/amuse-huayno/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.huayno.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/huayno/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/huayno/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-kepler-orbiters/setup.py b/packages/amuse-kepler-orbiters/setup.py index 47bd19588c..4a02fa9e27 100644 --- a/packages/amuse-kepler-orbiters/setup.py +++ b/packages/amuse-kepler-orbiters/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.kepler_orbiters.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/kepler_orbiters/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/kepler_orbiters/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-kepler/setup.py b/packages/amuse-kepler/setup.py index 924644a284..70aa8311ac 100644 --- a/packages/amuse-kepler/setup.py +++ b/packages/amuse-kepler/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.kepler.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/kepler/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/kepler/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mameclot/setup.py b/packages/amuse-mameclot/setup.py index 3d89a6b80e..517f82f965 100644 --- a/packages/amuse-mameclot/setup.py +++ b/packages/amuse-mameclot/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mameclot.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mameclot/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mameclot/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mercury/setup.py b/packages/amuse-mercury/setup.py index 0375bd0e1b..ab047ee447 100644 --- a/packages/amuse-mercury/setup.py +++ b/packages/amuse-mercury/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mercury.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mercury/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mercury/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mesa-r15140/setup.py b/packages/amuse-mesa-r15140/setup.py index 9988cf2a35..755b9082ce 100644 --- a/packages/amuse-mesa-r15140/setup.py +++ b/packages/amuse-mesa-r15140/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mesa_r15140.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mesa_r15140/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mesa_r15140/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, diff --git a/packages/amuse-mesa-r2208/setup.py b/packages/amuse-mesa-r2208/setup.py index 206f3d8e5c..463a1b2f97 100644 --- a/packages/amuse-mesa-r2208/setup.py +++ b/packages/amuse-mesa-r2208/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mesa_r2208.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mesa_r2208/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mesa_r2208/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, diff --git a/packages/amuse-mesa/setup.py b/packages/amuse-mesa/setup.py index 93bbb38fa4..6107d61a10 100644 --- a/packages/amuse-mesa/setup.py +++ b/packages/amuse-mesa/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mesa.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mesa/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mesa/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, diff --git a/packages/amuse-mikkola/setup.py b/packages/amuse-mikkola/setup.py index 3e6a8d97f6..b551b71a70 100644 --- a/packages/amuse-mikkola/setup.py +++ b/packages/amuse-mikkola/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mikkola.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mikkola/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mikkola/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mmams/setup.py b/packages/amuse-mmams/setup.py index c121fab16a..c18a15f1f9 100644 --- a/packages/amuse-mmams/setup.py +++ b/packages/amuse-mmams/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mmams.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mmams/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mmams/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mobse/setup.py b/packages/amuse-mobse/setup.py index df4069a36b..589f1646c1 100644 --- a/packages/amuse-mobse/setup.py +++ b/packages/amuse-mobse/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mobse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mobse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mobse/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-mosse/setup.py b/packages/amuse-mosse/setup.py index 18f9050db9..b584a12a54 100644 --- a/packages/amuse-mosse/setup.py +++ b/packages/amuse-mosse/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.mosse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/mosse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/mosse/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-nbody6xx/setup.py b/packages/amuse-nbody6xx/setup.py index 22c900826a..93da24b2cf 100644 --- a/packages/amuse-nbody6xx/setup.py +++ b/packages/amuse-nbody6xx/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.nbody6xx.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/nbody6xx/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/nbody6xx/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-petar/setup.py b/packages/amuse-petar/setup.py index 708df572a2..d4f5f3fd5b 100644 --- a/packages/amuse-petar/setup.py +++ b/packages/amuse-petar/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.petar.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/petar/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/petar/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-ph4/setup.py b/packages/amuse-ph4/setup.py index 13631f8d34..fc7e064342 100644 --- a/packages/amuse-ph4/setup.py +++ b/packages/amuse-ph4/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.ph4.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/ph4/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/ph4/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-phantom/setup.py b/packages/amuse-phantom/setup.py index cf06170d8f..0537c9dadc 100644 --- a/packages/amuse-phantom/setup.py +++ b/packages/amuse-phantom/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.phantom.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/phantom/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/phantom/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-phigrape/setup.py b/packages/amuse-phigrape/setup.py index 768028a14f..ea193e6e44 100644 --- a/packages/amuse-phigrape/setup.py +++ b/packages/amuse-phigrape/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.phigrape.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/phigrape/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/phigrape/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-seba/setup.py b/packages/amuse-seba/setup.py index 0e76cf04f6..e8784b948b 100644 --- a/packages/amuse-seba/setup.py +++ b/packages/amuse-seba/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.seba.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/seba/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/seba/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-secularmultiple/setup.py b/packages/amuse-secularmultiple/setup.py index 604c62cbaa..79ea80c9eb 100644 --- a/packages/amuse-secularmultiple/setup.py +++ b/packages/amuse-secularmultiple/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.secularmultiple.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/secularmultiple/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/secularmultiple/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-simplex/setup.py b/packages/amuse-simplex/setup.py index e1f2fe0786..cb580c0a55 100644 --- a/packages/amuse-simplex/setup.py +++ b/packages/amuse-simplex/setup.py @@ -34,24 +34,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.simplex.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/simplex/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/simplex/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -61,7 +54,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-smalln/setup.py b/packages/amuse-smalln/setup.py index e10de3ea7c..54560d413e 100644 --- a/packages/amuse-smalln/setup.py +++ b/packages/amuse-smalln/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.smalln.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/smalln/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/smalln/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-sphray/setup.py b/packages/amuse-sphray/setup.py index 79d36a48df..b946444b31 100644 --- a/packages/amuse-sphray/setup.py +++ b/packages/amuse-sphray/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.sphray.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/sphray/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/sphray/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-sse/setup.py b/packages/amuse-sse/setup.py index 7ba464be24..a87b58c6c4 100644 --- a/packages/amuse-sse/setup.py +++ b/packages/amuse-sse/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.sse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/sse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/sse/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-tests/setup.py b/packages/amuse-tests/setup.py index 36bc69f903..1768d0d9f7 100644 --- a/packages/amuse-tests/setup.py +++ b/packages/amuse-tests/setup.py @@ -39,24 +39,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.test.suite.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/test/suite/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/test/suite/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -66,7 +59,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-tutorial/setup.py b/packages/amuse-tutorial/setup.py index 2f32cc993a..a8e2e9c5b6 100644 --- a/packages/amuse-tutorial/setup.py +++ b/packages/amuse-tutorial/setup.py @@ -27,24 +27,17 @@ 'tutorial', 'share/amuse/tutorial', '*', recursive=True ) -try: - from tutorial.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "tutorial/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "tutorial/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -54,7 +47,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", # cmdclass=mapping_from_command_name_to_command_class, data_files=all_data_files, scripts=["bin/amuse-tutorial"], diff --git a/packages/amuse-twobody/setup.py b/packages/amuse-twobody/setup.py index a6304181b5..4b7a18d52a 100644 --- a/packages/amuse-twobody/setup.py +++ b/packages/amuse-twobody/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.twobody.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/twobody/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/twobody/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse-vader/setup.py b/packages/amuse-vader/setup.py index 09730c0455..f53c32698e 100644 --- a/packages/amuse-vader/setup.py +++ b/packages/amuse-vader/setup.py @@ -33,24 +33,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.vader.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/vader/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/vader/_version.py", +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -60,7 +53,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ diff --git a/packages/amuse/setup.py b/packages/amuse/setup.py index fdd44a70e8..c4873c9053 100644 --- a/packages/amuse/setup.py +++ b/packages/amuse/setup.py @@ -54,24 +54,16 @@ long_description_content_type = "text/markdown" -try: - from src.amuse.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = { - "root": "../..", - "relative_to": __file__, - # "write_to": "src/amuse/version.py", - } +setup_requires = ['setuptools_scm'] +use_scm_version = { + "root": "../..", + "relative_to": __file__, +} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -81,6 +73,6 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", packages=[], ) diff --git a/packages/community_package_names b/packages/community_package_names index 99170261b0..bc58da0834 100644 --- a/packages/community_package_names +++ b/packages/community_package_names @@ -27,6 +27,7 @@ MESA-r15140 MMAMS MOBSE MOSSE +Nbody6xx PeTar ph4 Phantom diff --git a/packages/setup_template.py b/packages/setup_template.py index f6ebf93ed7..f86089a379 100644 --- a/packages/setup_template.py +++ b/packages/setup_template.py @@ -37,24 +37,17 @@ mapping_from_command_name_to_command_class = setup_commands() -try: - from src.amuse.community.{name_lowercase}.version import version - use_scm_version = False - setup_requires = [] -except ImportError: - version = False - setup_requires = ['setuptools_scm'] - use_scm_version = {{ - "root": "../..", - "relative_to": __file__, - "write_to": "src/amuse/community/{name_lowercase}/version.py", - }} +setup_requires = ['setuptools_scm'] +use_scm_version = {{ + "root": "../..", + "relative_to": __file__, + "version_file": "src/amuse/community/{name_lowercase}/_version.py", +}} setup( name=name, use_scm_version=use_scm_version, setup_requires=setup_requires, - version=version, classifiers=classifiers, url=url, author_email=author_email, @@ -64,7 +57,7 @@ long_description=long_description, long_description_content_type=long_description_content_type, install_requires=install_requires, - python_requires=">=3.5", + python_requires=">=3.7", cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={{ diff --git a/src/amuse/support/literature.py b/src/amuse/support/literature.py index ad9c28b837..e7a3418651 100644 --- a/src/amuse/support/literature.py +++ b/src/amuse/support/literature.py @@ -18,7 +18,7 @@ from docutils import nodes from amuse.support import exceptions try: - from amuse.version import version as amuse_version + from amuse._version import version as amuse_version except ImportError: amuse_version = "unknown version" @@ -281,14 +281,15 @@ def __init__(self): def version(cls): try: version = importlib.import_module( - '..version', + '.._version', cls.__module__ ).version except (ImportError, ValueError): try: from amuse.version import version + version = f"framework {version}" except ImportError: - version = "unknown" + version = "unknown version" return version @classmethod