Merge pull request #111 from ubermag/metadata-update

Update repository metadata

Author: lang-m

.github/workflows/oommf-from-master.yml

@@ -2,8 +2,12 @@ name: oommf-from-master
 
 on:
   push:
+    branches:
+      - master
+  pull_request:
   schedule:
     - cron: '0 0 * * 1'  # run every Monday
+  workflow_dispatch:
 
 env:
   PYTEST_ADDOPTS: "--color=yes"
@@ -58,7 +62,7 @@ jobs:
         echo "PATH=$GITHUB_WORKSPACE/bin:$PATH" >> $GITHUB_ENV
 
     - name: Install testing packages
-      run: python -m pip install --upgrade pip pytest-cov nbval pycodestyle
+      run: python -m pip install --upgrade pip pytest-cov nbval pycodestyle invoke
 
     - name: Install ubermag dependencies
       run: |
@@ -73,10 +77,10 @@ jobs:
       run: python -m pip install .
 
     - name: Unit tests
-      run: make test-unittests
+      run: invoke test.unittest
 
     - name: Documentation tests
-      run: make test-docs
+      run: invoke test.docs
 
     - name: Jupyter notebook tests
-      run: make test-ipynb
+      run: invoke test.ipynb

Makefile

@@ -1,6 +1,6 @@
 # oommfc
 
-[Marijan Beg](https://github.com/marijanbeg)<sup>1,2</sup>, [Martin Lang](https://github.com/lang-m)<sup>2</sup>, [Ryan A. Pepper](https://github.com/rpep)<sup>3</sup>, [Thomas Kluyver](https://github.com/takluyver)<sup>4</sup>, [Samuel Holt](https://github.com/samjrholt)<sup>2,5</sup>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,6,7</sup>
+[Marijan Beg](https://github.com/marijanbeg)<sup>1,2</sup>, [Martin Lang](https://github.com/lang-m)<sup>2</sup>, [Ryan A. Pepper](https://github.com/rpep)<sup>3</sup>, [Thomas Kluyver](https://github.com/takluyver)<sup>4</sup>, [Samuel Holt](https://github.com/samjrholt)<sup>2,5</sup>, [Swapneel Amit Pathak](https://github.com/swapneelap)<sup>2,6</sup>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,6,7</sup>
 
 <sup>1</sup> *Department of Earth Science and Engineering, Imperial College London, London SW7 2AZ, UK*  
 <sup>2</sup> *Faculty of Engineering and Physical Sciences, University of Southampton, Southampton SO17 1BJ, UK*  
@@ -26,7 +26,7 @@
 | Platforms | [![Platforms](https://anaconda.org/conda-forge/oommfc/badges/platforms.svg)](https://anaconda.org/conda-forge/oommfc) |
 | Downloads | [![Downloads](https://anaconda.org/conda-forge/oommfc/badges/downloads.svg)](https://anaconda.org/conda-forge/oommfc) |
 | License | [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) |
-| DOI | [![DOI](https://zenodo.org/badge/67028400.svg)](https://zenodo.org/badge/latestdoi/67028400) |
+| DOI | [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3539461.svg)](https://doi.org/10.5281/zenodo.3539461) |
 
 ## About
 
@@ -79,7 +79,7 @@ Licensed under the BSD 3-Clause "New" or "Revised" License. For details, please
 
 2. M. Beg, R. A. Pepper, and H. Fangohr. User interfaces for computational science: A domain specific language for OOMMF embedded in Python. [*AIP Advances* **7**, 56025](http://aip.scitation.org/doi/10.1063/1.4977225) (2017).
 
-3. Marijan Beg, Martin Lang, Ryan A. Pepper, Thomas Kluyver, Samuel Holt, and Hans Fangohr. oommfc: OOMMF calculator. DOI: [10.5281/zenodo.3539461](http://doi.org/10.5281/zenodo.3539461) (2022).
+3. Marijan Beg, Martin Lang, Ryan A. Pepper, Thomas Kluyver, Samuel Holt, Swapneel Amit Pathak, and Hans Fangohr. oommfc: OOMMF calculator. DOI: [10.5281/zenodo.3539461](http://doi.org/10.5281/zenodo.3539461) (2022).
 
 ## Acknowledgements
 

README.md

@@ -1,6 +1,5 @@
 [build-system]
-# 40.8.0 is the first version compatible with PEP 517
-requires = ["setuptools>=40.8.0", "wheel"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -17,6 +16,7 @@ authors = [
     {name = "Ryan A. Pepper"},
     {name = "Thomas Kluyver"},
     {name = "Samuel Holt"},
+    {name = "Swapneel Amit Pathak"},
     {name = "Hans Fangohr"}
 ]
 
@@ -59,8 +59,17 @@ repository = "https://github.com/ubermag/oommfc"
 
 
 
+[tool.black]
+experimental-string-processing = true
+
+[tool.coverage.run]
+omit = ["oommfc/tests/*"]
+
+[tool.isort]
+profile = "black"
+skip_gitignore = true  # ignores files listed in .gitignore
+
 # to define additional information we use a custom table
-# we need to own the entry for tool.NAME on PyPI
 # see: https://www.python.org/dev/peps/pep-0518/#tool-table
 [tool.ubermag]
 doi = "10.5281/zenodo.3539461"
@@ -75,13 +84,3 @@ contributors = [
 about = """
 - An Object Oriented MicroMagnetic Framework [OOMMF](https://math.nist.gov/oommf/) calculator for computational magnetism models defined with `micromagneticmodel`.
 """
-
-[tool.coverage.run]
-omit = ["oommfc/tests/*"]
-
-[tool.isort]
-profile = "black"
-skip_gitignore = true  # ignores files listed in .gitignore
-
-[tool.black]
-experimental-string-processing = true

pyproject.toml

@@ -1,41 +1,7 @@
-[metadata]
-name = oommfc
-version = 0.62.0
-description = OOMMF calculator.
-author = Marijan Beg, Martin Lang, Ryan A. Pepper, Thomas Kluyver, Samuel Holt, and Hans Fangohr
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://ubermag.github.io
-licence = BSD 3-Clause License
-classifiers =
-    Development Status :: 5 - Production/Stable
-    Intended Audience :: Education
-    Intended Audience :: Developers
-    Intended Audience :: Science/Research
-    License :: OSI Approved :: BSD License
-    Natural Language :: English
-    Operating System :: MacOS
-    Operating System :: Microsoft :: Windows
-    Operating System :: Unix
-    Programming Language :: Python :: 3 :: Only
-    Topic :: Scientific/Engineering :: Physics
-    Topic :: Scientific/Engineering :: Mathematics
-    Topic :: Scientific/Engineering :: Visualization
-
 [options]
 packages = find:
-python_requires >= 3.8
-install_requires =
-    micromagnetictests>=0.61.3
-    ubermagtable>=0.61.1
-    micromagneticdata>=0.62.0
 include_package_data = True
 
-[options.extras_require]
-dev = build;invoke;nbval;pre-commit;pytest-cov;twine
-
-
-
 [flake8]
 exclude =
   .git,

setup.cfg

@@ -2,7 +2,6 @@
 import os
 import shutil
 
-import iniconfig
 import pytest
 import tomli
 from invoke import Collection, Exit, task
@@ -106,13 +105,8 @@ def release(c):
         if e.code != pytest.ExitCode.OK:
             raise e
 
-    version = iniconfig.IniConfig("setup.cfg").get("metadata", "version")
-    # sanity checks while we have two places containing the version.
     with open("pyproject.toml", "rb") as f:
-        toml_version = tomli.load(f)["project"]["version"]
-    assert (
-        toml_version == version
-    ), "Different versions in pyproject.toml and setup.cfg. Aborting."
+        version = tomli.load(f)["project"]["version"]
 
     c.run(f"git tag {version}")  # fails if the tag exists
     c.run("git tag -f latest")  # `latest` tag for binder