Skip to content

Commit

Permalink
Merge pull request #25 from ubermag/metadata-update
Browse files Browse the repository at this point in the history
Update repository metadata
  • Loading branch information
lang-m authored Jun 24, 2022
2 parents 2f7fcd0 + 83d8aaa commit 13350c8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 83 deletions.
27 changes: 0 additions & 27 deletions Makefile

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# micromagnetictests

[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>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,4,5</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>, and [Hans Fangohr](https://github.com/fangohr)<sup>2,4,5</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*
Expand All @@ -24,7 +24,7 @@
| Platforms | [![Platforms](https://anaconda.org/conda-forge/micromagnetictests/badges/platforms.svg)](https://anaconda.org/conda-forge/micromagnetictests) |
| Downloads | [![Downloads](https://anaconda.org/conda-forge/micromagnetictests/badges/downloads.svg)](https://anaconda.org/conda-forge/micromagnetictests) |
| 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.3707736.svg)](https://doi.org/10.5281/zenodo.3707736) |

## About

Expand Down Expand Up @@ -72,7 +72,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, and Hans Fangohr. micromagnetictests: Testing package for computational magnetism tools. DOI: [10.5281/zenodo.3707736](http://doi.org/10.5281/zenodo.3707736) (2022).
3. Marijan Beg, Martin Lang, Samuel Holt, Swapneel Amit Pathak, and Hans Fangohr. micromagnetictests: Testing package for computational magnetism tools. DOI: [10.5281/zenodo.3707736](http://doi.org/10.5281/zenodo.3707736) (2022).

## Acknowledgements

Expand Down
25 changes: 12 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -15,6 +14,7 @@ authors = [
{name = "Marijan Beg"},
{name = "Martin Lang"},
{name = "Samuel Holt"},
{name = "Swapneel Amit Pathak"},
{name = "Hans Fangohr"}
]

Expand Down Expand Up @@ -56,8 +56,17 @@ repository = "https://github.com/ubermag/micromagnetictests"



[tool.black]
experimental-string-processing = true

[tool.coverage.run]
omit = ["micromagnetictests/tests/*", "micromagnetictests/calculatortests/*"]

[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.3707736"
Expand All @@ -67,13 +76,3 @@ contributors = [
about = """
- A collection of computational magnetism tests for testing different calculators
"""

[tool.coverage.run]
omit = ["micromagnetictests/tests/*", "micromagnetictests/calculatortests/*"]

[tool.isort]
profile = "black"
skip_gitignore = true # ignores files listed in .gitignore

[tool.black]
experimental-string-processing = true
33 changes: 0 additions & 33 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,40 +1,7 @@
[metadata]
name = micromagnetictests
version = 0.61.3
description = Testing package for computational magnetism tools.
author = Marijan Beg, Martin Lang, 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 =
micromagneticmodel>=0.61.1
scipy>=1.5
include_package_data = True

[options.extras_require]
dev = build;invoke;nbval;pre-commit;pytest-cov;twine



[flake8]
exclude =
.git,
Expand Down
8 changes: 1 addition & 7 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import os
import shutil

import iniconfig
import pytest
import tomli
from invoke import Collection, Exit, task
Expand Down Expand Up @@ -112,13 +111,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
Expand Down

0 comments on commit 13350c8

Please sign in to comment.