From fb78a3554164288d2e72d6d09d0f016c397ed2d0 Mon Sep 17 00:00:00 2001 From: Steven Rieder Date: Tue, 2 Jun 2020 13:14:18 +0100 Subject: [PATCH 1/3] prepare for standalone amuse-units package --- packages/amuse-framework/MANIFEST.in | 1 + packages/amuse-units/MANIFEST.in | 8 ++++ packages/amuse-units/README.md | 1 + packages/amuse-units/pyproject.toml | 2 + packages/amuse-units/setup.py | 58 ++++++++++++++++++++++++++++ packages/amuse-units/src/amuse/units | 1 + packages/amuse-units/support | 1 + 7 files changed, 72 insertions(+) create mode 100644 packages/amuse-units/MANIFEST.in create mode 100644 packages/amuse-units/README.md create mode 100644 packages/amuse-units/pyproject.toml create mode 100644 packages/amuse-units/setup.py create mode 120000 packages/amuse-units/src/amuse/units create mode 120000 packages/amuse-units/support diff --git a/packages/amuse-framework/MANIFEST.in b/packages/amuse-framework/MANIFEST.in index 0e2d54051f..1408a15381 100644 --- a/packages/amuse-framework/MANIFEST.in +++ b/packages/amuse-framework/MANIFEST.in @@ -10,6 +10,7 @@ recursive-include lib * recursive-include support * recursive-exclude src/amuse/community * +recursive-exclude src/amuse/units * include src/amuse/community/__init__.py recursive-include src/amuse/community/interface * diff --git a/packages/amuse-units/MANIFEST.in b/packages/amuse-units/MANIFEST.in new file mode 100644 index 0000000000..bd9d660416 --- /dev/null +++ b/packages/amuse-units/MANIFEST.in @@ -0,0 +1,8 @@ +include support/__init__.py +include support/setup_codes.py +include support/version.py +include support/classifiers.py +include pyproject.toml + +recursive-include src * +recursive-exclude src *.pyc *.o *~ .pc ccache *.a diff --git a/packages/amuse-units/README.md b/packages/amuse-units/README.md new file mode 100644 index 0000000000..410a33642f --- /dev/null +++ b/packages/amuse-units/README.md @@ -0,0 +1 @@ +This package installs the AMUSE unit system. diff --git a/packages/amuse-units/pyproject.toml b/packages/amuse-units/pyproject.toml new file mode 100644 index 0000000000..a8b7d76261 --- /dev/null +++ b/packages/amuse-units/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = [ "setuptools", "wheel", ] diff --git a/packages/amuse-units/setup.py b/packages/amuse-units/setup.py new file mode 100644 index 0000000000..73205e7c40 --- /dev/null +++ b/packages/amuse-units/setup.py @@ -0,0 +1,58 @@ +import sys +import os +from support.version import version, main_version +from support.classifiers import classifiers + +from setuptools import setup + +import support +support.use("system") +from support.setup_codes import setup_commands + +name = 'amuse-units' +author = 'The AMUSE team' +author_email = 'info@amusecode.org' +license_ = "Apache License 2.0" +url = 'http://www.amusecode.org/' +install_requires = [ +] +description = 'The Astrophysical Multipurpose Software Environment - unit system' +with open("README.md", "r") as fh: + long_description = fh.read() +long_description_content_type = "text/markdown" + +extensions = [] + +all_data_files = [] + +packages = [ + 'amuse.units', +] + +package_data = { +} + +mapping_from_command_name_to_command_class=setup_commands() + +setup( + name=name, + version=version, + classifiers=classifiers, + url=url, + author_email=author_email, + author=author, + license=license_, + description=description, + long_description=long_description, + long_description_content_type=long_description_content_type, + install_requires=install_requires, + python_requires=">=3.5", + cmdclass=mapping_from_command_name_to_command_class, + ext_modules=extensions, + package_dir={ + 'amuse.units': 'src/amuse/units' + }, + packages=packages, + package_data=package_data, + data_files=all_data_files, +) diff --git a/packages/amuse-units/src/amuse/units b/packages/amuse-units/src/amuse/units new file mode 120000 index 0000000000..2afb601da3 --- /dev/null +++ b/packages/amuse-units/src/amuse/units @@ -0,0 +1 @@ +../../../../src/amuse/units \ No newline at end of file diff --git a/packages/amuse-units/support b/packages/amuse-units/support new file mode 120000 index 0000000000..321fcb594c --- /dev/null +++ b/packages/amuse-units/support @@ -0,0 +1 @@ +../../support \ No newline at end of file From 1944a51ee2b1ffe0634934786c07750e46511d3f Mon Sep 17 00:00:00 2001 From: Steven Rieder Date: Tue, 2 Jun 2020 13:16:14 +0100 Subject: [PATCH 2/3] framework depends on units --- packages/amuse-framework/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/amuse-framework/setup.py b/packages/amuse-framework/setup.py index 746e863052..da76a1978d 100644 --- a/packages/amuse-framework/setup.py +++ b/packages/amuse-framework/setup.py @@ -19,6 +19,7 @@ 'numpy>=1.2.2', 'nose>=0.11.1', 'h5py>=1.1.0', + 'amuse-units', ] description = 'The Astrophysical Multipurpose Software Environment' with open("README.md", "r") as fh: From 0a8252523294485b984f23a345d3fbb16950e4c8 Mon Sep 17 00:00:00 2001 From: Steven Rieder Date: Tue, 2 Jun 2020 13:21:47 +0100 Subject: [PATCH 3/3] remove setup --- packages/amuse-units/setup.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/amuse-units/setup.py b/packages/amuse-units/setup.py index 73205e7c40..123ea26082 100644 --- a/packages/amuse-units/setup.py +++ b/packages/amuse-units/setup.py @@ -5,10 +5,6 @@ from setuptools import setup -import support -support.use("system") -from support.setup_codes import setup_commands - name = 'amuse-units' author = 'The AMUSE team' author_email = 'info@amusecode.org' @@ -32,8 +28,6 @@ package_data = { } -mapping_from_command_name_to_command_class=setup_commands() - setup( name=name, version=version, @@ -47,7 +41,6 @@ long_description_content_type=long_description_content_type, install_requires=install_requires, python_requires=">=3.5", - cmdclass=mapping_from_command_name_to_command_class, ext_modules=extensions, package_dir={ 'amuse.units': 'src/amuse/units'