Merge branch 'master' of github.com:ubermag/ubermag

README.md

@@ -1,14 +1,14 @@
 # ubermag
 
-[Marijan Beg](https://github.com/marijanbeg)<sup>1,2</sup>, [Martin Lang](https://github.com/lang-m)<sup>2</sup>, [Samuel Holt](https://github.com/samjrholt)<sup>2,3</sup>, [Ryan A. Pepper](https://github.com/rpep)<sup>4</sup>, [Thomas Kluyver](https://github.com/takluyver)<sup>5</sup>, [Jeroen Mulkers](https://github.com/JeroenMulkers)<sup>6</sup>, [Jonathan Leliaert](https://github.com/JLeliaert)<sup>6</sup>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,7,8</sup>
+[Marijan Beg](https://github.com/marijanbeg)<sup>1,2</sup>, [Martin Lang](https://github.com/lang-m)<sup>2</sup>, [Samuel Holt](https://github.com/samjrholt)<sup>2,3</sup>, [Swapneel Amit Pathak](https://github.com/swapneelap)<sup>2,4</sup>, [Ryan A. Pepper](https://github.com/rpep)<sup>5</sup>, [Thomas Kluyver](https://github.com/takluyver)<sup>6</sup>, [Jeroen Mulkers](https://github.com/JeroenMulkers)<sup>7</sup>, [Jonathan Leliaert](https://github.com/JLeliaert)<sup>7</sup>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,4,8</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*  
 <sup>3</sup> *Department of Physics, University of Warwick, Coventry CV4 7AL, UK*  
-<sup>4</sup> *Research Software Group, University of Birmingham, Birmingham B15 2TT, UK*  
-<sup>5</sup> *European XFEL GmbH, Holzkoppel 4, 22869 Schenefeld, Germany*  
-<sup>6</sup> *Faculty of Sciences, Ghent University, Krijgslaan 281, S12, 9000 Ghent, Belgium*  
-<sup>7</sup> *Max Planck Institute for the Structure and Dynamics of Matter, Luruper Chaussee 149, 22761 Hamburg, Germany*  
+<sup>4</sup> *Max Planck Institute for the Structure and Dynamics of Matter, Luruper Chaussee 149, 22761 Hamburg, Germany*  
+<sup>5</sup> *Research Software Group, University of Birmingham, Birmingham B15 2TT, UK*  
+<sup>6</sup> *European XFEL GmbH, Holzkoppel 4, 22869 Schenefeld, Germany*  
+<sup>7</sup> *Faculty of Sciences, Ghent University, Krijgslaan 281, S12, 9000 Ghent, Belgium*  
 <sup>8</sup> *Center for Free-Electron Laser Science, Luruper Chaussee 149, 22761 Hamburg, Germany*  
 
 
@@ -27,7 +27,7 @@
 | Platforms | [![Platforms](https://anaconda.org/conda-forge/ubermag/badges/platforms.svg)](https://anaconda.org/conda-forge/ubermag) |
 | Downloads | [![Downloads](https://anaconda.org/conda-forge/ubermag/badges/downloads.svg)](https://anaconda.org/conda-forge/ubermag) |
 | 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.3539495.svg)](https://doi.org/10.5281/zenodo.3539495) |
 
 ## About
 
@@ -77,7 +77,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, Samuel Holt, Ryan A. Pepper, Thomas Kluyver, Jeroen Mulkers, Jonathan Leliaert, and Hans Fangohr. ubermag: Meta package for Ubermag project. DOI: [10.5281/zenodo.3539495](http://doi.org/10.5281/zenodo.3539495) (2022).
+3. Marijan Beg, Martin Lang, Samuel Holt, Swapneel Amit Pathak, Ryan A. Pepper, Thomas Kluyver, Jeroen Mulkers, Jonathan Leliaert, and Hans Fangohr. ubermag: Meta package for Ubermag project. DOI: [10.5281/zenodo.3539495](http://doi.org/10.5281/zenodo.3539495) (2022).
 
 ## Acknowledgements
 

docs/ubermag-version.ipynb

@@ -0,0 +1,56 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "b0c347de-cb57-476d-b893-10c541ba4210",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import ubermag"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "ca1ea197-c3f2-4217-8b58-20a913f5ad00",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'0.62.1'"
+      ]
+     },
+     "execution_count": 2,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "ubermag.__version__"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.13"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

pyproject.toml

@@ -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]
@@ -15,6 +14,7 @@ authors = [
     {name = "Marijan Beg"},
     {name = "Martin Lang"},
     {name = "Samuel Holt"},
+    {name = "Swapneel Amit Pathak"},
     {name = "Ryan A. Pepper"},
     {name = "Thomas Kluyver"},
     {name = "Jeroen Mulkers"},
@@ -66,8 +66,17 @@ repository = "https://github.com/ubermag/ubermag"
 
 
 
+[tool.black]
+experimental-string-processing = true
+
+[tool.coverage.run]
+omit = ["ubermag/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.3539495"
@@ -79,13 +88,3 @@ about = """
 
 - Logging control in Ubermag packages.
 """
-
-[tool.coverage.run]
-omit = ["ubermag/tests/*"]
-
-[tool.isort]
-profile = "black"
-skip_gitignore = true  # ignores files listed in .gitignore
-
-[tool.black]
-experimental-string-processing = true

setup.cfg

@@ -1,46 +1,7 @@
-[metadata]
-name = ubermag
-version = 0.62.1
-description = Meta package for Ubermag project.
-author = Marijan Beg, Martin Lang, Samuel Holt, Ryan A. Pepper, Thomas Kluyver, Jeroen Mulkers, Jonathan Leliaert, 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 =
-    ubermagutil==0.62.0
-    discretisedfield==0.62.1
-    ubermagtable==0.61.1
-    micromagneticmodel==0.61.1
-    micromagneticdata==0.62.0
-    micromagnetictests==0.61.3
-    oommfc==0.62.0
-    mag2exp==0.61.1
 include_package_data = True
 
-[options.extras_require]
-dev = build;invoke;nbval;pre-commit;pytest-cov;twine
-
-
-
 [flake8]
 exclude =
   .git,

tasks.py

@@ -2,7 +2,6 @@
 import os
 import shutil
 
-import iniconfig
 import pytest
 import tomli
 from invoke import Collection, Exit, task
@@ -53,7 +52,7 @@ def all(c):
         try:
             cmd(c)
         except Exit as e:
-            if e.code not in {pytest.ExitCode.OK, pytest.ExitCode.NO_TESTS_COLLECTED}:
+            if e.code != pytest.ExitCode.OK:
                 raise e
     raise Exit(code=pytest.ExitCode.OK)
 
@@ -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