cosmic-popsynth 3.4.14__tar.gz → 3.4.16__tar.gz

{cosmic_popsynth-3.4.14 → cosmic_popsynth-3.4.16}/.github/workflows/build_wheels_and_publish.yml

@@ -10,8 +10,10 @@ env:
   CIBW_BUILD: "cp39-* cp310-*"
   CIBW_SKIP: "*-win32 *musllinux*"
   CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+  CIBW_ARCHS_MACOS: "x86_64 arm64"
   CIBW_BEFORE_BUILD: pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
   CIBW_BUILD_VERBOSITY: "1"
+  CIBW_ENVIRONMENT_MACOS: "FC=gfortran"
 
 jobs:
   build-wheels-and-dist:
@@ -20,6 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        python-version: [3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v3
@@ -30,24 +33,33 @@ jobs:
       with:
         python-version: "3.10"
 
-    - name: Install gfortran
+    - name: link gfortran and hdf5
       if: runner.os == 'macOS'
       run: |
-        sudo ln -s /opt/homebrew/bin/gfortran-14 /usr/local/bin/gfortran
+        sudo ln -s /opt/homebrew/bin/gfortran-12 /usr/local/bin/gfortran
+        brew reinstall hdf5
         
     - name: Install numpy
       run: |
         python -m pip install --upgrade pip
-        python -m pip install numpy h5py versioneer
-        
-    - name: Build source dist and wheels
+        python -m pip install numpy h5py versioneer 
+
+    - name: Install dependencies
+      run: |
+        python -m pip install cibuildwheel==2.17.0 setuptools wheel build meson-python ninja meson
+
+    - name: Build source distribution (sdist)
       run: |
-        python -m pip install setuptools wheel twine numpy build meson ninja
-        pip install .
-        python -m build
+        python -m build --sdist --outdir dist
+
+    - name: Build wheels using cibuildwheel
+      run: |
+        python -m cibuildwheel --output-dir dist
+        
     - uses: actions/upload-artifact@v3
       with:
         path: ./dist/*.tar.gz
+        
     - uses: actions/upload-artifact@v3
       with:
         path: ./dist/*.whl

{cosmic_popsynth-3.4.14 → cosmic_popsynth-3.4.16}/.gitignore

@@ -3,6 +3,8 @@
 !/**/
 !*.*
 
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -112,4 +114,4 @@ ENV/
 binary.in
 binary.dat
 *.h5
-fort.99
+fort.99

{cosmic_popsynth-3.4.14 → cosmic_popsynth-3.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cosmic-popsynth
-Version: 3.4.14
+Version: 3.4.16
 Summary: a Python-interfaced binary population synthesis suite
 Author: Scott Coughlin, Michael Zevin, Carl L. Rodriguez, Tom Wagg
 Author-Email: Katelyn Breivik <katie.breivik@gmail.com>
@@ -23,21 +23,6 @@ Requires-Dist: h5py
 Requires-Dist: schwimmbad
 Requires-Dist: matplotlib
 Requires-Dist: importlib-metadata
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-xdist; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: flake8; extra == "test"
-Requires-Dist: coverage; extra == "test"
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: sphinx-bootstrap-theme; extra == "docs"
-Requires-Dist: sphinxcontrib-programoutput; extra == "docs"
-Requires-Dist: sphinx-automodapi; extra == "docs"
-Requires-Dist: ipython; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
-Requires-Dist: pickleshare; extra == "docs"
-Provides-Extra: test
-Provides-Extra: docs
 Description-Content-Type: text/markdown
 
 # COSMIC

{cosmic_popsynth-3.4.14 → cosmic_popsynth-3.4.16}/meson.build

@@ -1,7 +1,7 @@
 project('cosmic', 
     'c',
     'fortran',
-    version : '3.4.14',
+    version : '3.4.16',
     default_options: ['warning_level=0', 'optimization=3'],
 )
 
@@ -11,23 +11,21 @@ ff = meson.get_compiler('fortran')
 f_args = ff.get_supported_arguments('-fPIC')
 add_project_arguments(f_args, language: 'fortran')
 
-py3 = import('python').find_installation()
+
+py3 = import('python').find_installation(pure: false)
 
 numpy_include_dir = run_command(py3, ['-c', 'import numpy; print(numpy.get_include())'], check: true).stdout().strip()
 f2py_include_dir = run_command(py3, ['-c', 'import numpy.f2py; print(numpy.f2py.get_include())'], check: true).stdout().strip()
 inc_np = include_directories(numpy_include_dir, f2py_include_dir)
+
 get_hash = run_command('python', './src/cosmic/get_commit_hash.py', check: true).stdout().strip()
-f2py_source = custom_target(
-    'evolvebin-target',
-    input : ['src/cosmic/src/evolv2.f', 'src/cosmic/src/comprad.f'],
-    output : ['_evolvebinmodule.c', '_evolvebin-f2pywrappers.f'],
-    command : [py3, '-m', 'numpy.f2py', '@INPUT@', '-m', '_evolvebin', '--lower', '@OUTDIR']
-)
+
 
 lib_source = [
     'src/cosmic/src/hrdiag_remnant.f',
     'src/cosmic/src/assign_remnant.f',
     'src/cosmic/src/benchmarkevolv2.f',
+    'src/cosmic/src/int64.f',
     'src/cosmic/src/corerd.f',
     'src/cosmic/src/comenv.f',
     'src/cosmic/src/dgcore.f',
@@ -53,7 +51,7 @@ lib_source = [
     'src/cosmic/src/hrdiag.f',
     'src/cosmic/src/star.f',
     'src/cosmic/src/zcnsts.f',
-    'src/cosmic/src/zfuncs.f',]
+    'src/cosmic/src/zfuncs.f']
 
 # Detect operating system and set appropriate linker flags
 host_system = host_machine.system()
@@ -64,6 +62,15 @@ else
   ldflags = []  # No special flags for other systems
 endif
 
+
+f2py_source = custom_target(
+    'evolvebin-target',
+    input : ['src/cosmic/src/evolv2.f', 'src/cosmic/src/comprad.f'],
+    output : ['_evolvebinmodule.c', '_evolvebin-f2pywrappers.f'],
+    command : [py3, '-m', 'numpy.f2py', '@INPUT@', '-m', '_evolvebin', '--lower']
+)
+
+
 evolvebin_module = py3.extension_module('_evolvebin',
   f2py_source,
   lib_source,
@@ -71,19 +78,10 @@ evolvebin_module = py3.extension_module('_evolvebin',
   include_directories: inc_np,
   link_args: ldflags,
   install : true,
-  install_dir : py3.get_install_dir() / 'cosmic'
+  subdir : 'cosmic'
 )
 
-
-module_dirs = ['src/cosmic', 'src/cosmic/bse_utils', 
-               'src/cosmic/sample', 'src/cosmic/tests']
-
-# Install modules
-foreach mod_dir: module_dirs
-    install_subdir(mod_dir,
-                  install_dir: py3.get_install_dir())
-endforeach
-
-
 python_script = 'bin/cosmic-pop'
 install_data(python_script, install_dir: get_option('bindir'))
+
+subdir('src/cosmic')

{cosmic_popsynth-3.4.14 → cosmic_popsynth-3.4.16}/pyproject.toml

@@ -10,8 +10,7 @@ authors = [
     { name="Tom Wagg" },
 ]
 readme = "README.md"
-
-
+version = "3.4.16"
 requires-python = ">=3.9"
 license = { text = "MIT License" }
 classifiers = [
@@ -22,25 +21,12 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
 ]
-dynamic = ["version"]
-dependencies = ["numpy", "scipy", "astropy", "configparser", 
-                "tqdm", "pandas", "tables", "h5py", "schwimmbad", 
+dependencies = ["numpy", "scipy", "astropy", "configparser",
+                "tqdm", "pandas", "tables", "h5py", "schwimmbad",
                 "matplotlib", "importlib-metadata"]
 
 
-[project.optional-dependencies]
-test = ["pytest", "pytest-xdist", "pytest-cov", "flake8", "coverage"]
-docs = ["sphinx", "numpydoc", "sphinx-bootstrap-theme", 
-        "sphinxcontrib-programoutput", "sphinx-automodapi",
-        "ipython", "sphinx_rtd_theme", "pickleshare"]
-
-
-
 [build-system]
-requires = ["meson", "meson-python", "wheel", "numpy", "setuptools"]
 build-backend = 'mesonpy'
+requires = ['meson-python', 'numpy']
 
-
-# pyproject.toml
-[tool.setuptools]
-write_to = "src/cosmic/_version.py"

cosmic_popsynth-3.4.16/src/cosmic/_version.py

@@ -0,0 +1 @@
+__version__ = "3.4.16"

cosmic_popsynth-3.4.16/src/cosmic/bse_utils/meson.build

@@ -0,0 +1,10 @@
+python_sources = [
+  '__init__.py',
+  'zcnsts.py',
+  'zdata.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/bse_utils'
+)

cosmic_popsynth-3.4.16/src/cosmic/meson.build

@@ -0,0 +1,21 @@
+python_sources = [
+  '__init__.py',
+  '_commit_hash.py',
+  '_version.py',
+  'checkstate.py',
+  'evolve.py',
+  'filter.py',
+  'get_commit_hash.py',
+  'Match.py',
+  'plotting.py',
+  'utils.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic'
+)
+
+subdir('bse_utils')
+subdir('sample')
+subdir('tests')

cosmic_popsynth-3.4.16/src/cosmic/sample/cmc/meson.build

@@ -0,0 +1,10 @@
+python_sources = [
+  '__init__.py',
+  'elson.py',
+  'king.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/sample/cmc'
+)

cosmic_popsynth-3.4.16/src/cosmic/sample/meson.build

@@ -0,0 +1,13 @@
+python_sources = [
+  '__init__.py',
+  'initialbinarytable.py',
+  'initialcmctable.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/sample'
+)
+
+subdir('cmc')
+subdir('sampler')

cosmic_popsynth-3.4.16/src/cosmic/sample/sampler/meson.build

@@ -0,0 +1,12 @@
+python_sources = [
+  '__init__.py',
+  'cmc.py',
+  'independent.py',
+  'sampler.py',
+  'multidim.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic/sample/sampler'
+)

cosmic_popsynth-3.4.16/src/cosmic/tests/meson.build

@@ -0,0 +1,11 @@
+python_sources = [
+  'test_evolve.py',
+  'test_match.py',
+  'test_sample.py',
+  'test_utils.py'
+]
+
+py3.install_sources(
+  python_sources,
+  subdir: 'cosmic'
+)

cosmic_popsynth-3.4.14/src/cosmic/_version.py

@@ -1 +0,0 @@
-__version__ = "3.4.14"