Skip to content

Commit

Permalink
Merge pull request #498 from Sinclert/setup-migration
Browse files Browse the repository at this point in the history
Package setup spec migration
  • Loading branch information
Sinclert authored Nov 4, 2021
2 parents f119e79 + 954923a commit 60b7fd5
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 121 deletions.
9 changes: 9 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### NOTE:
###
### This file is required when creating a "source distribution":
###
### Reference: https://packaging.python.org/guides/using-manifest-in/
### Command: $ python -m build --sdist ...

include README.md
include VERSION
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.9.1
8 changes: 3 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@

# -- Project information -----------------------------------------------------

info = {}
project_folder = Path(__file__).parent.parent
with open(project_folder.joinpath('madminer', '__info__.py')) as f:
exec(f.read(), info)
version_file = project_folder.joinpath("VERSION")

project = 'MadMiner'
authors = info['__authors__']
version = info['__version__']
authors = 'Johann Brehmer, Felix Kling, Irina Espejo, Sinclert Perez, Kyle Cranmer'
version = open(version_file).read().strip()
copyright = '{} 2018-2020'.format(authors)

# The full version, including alpha/beta/rc tags
Expand Down
9 changes: 0 additions & 9 deletions madminer/__info__.py

This file was deleted.

17 changes: 0 additions & 17 deletions madminer/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from .__info__ import __authors__, __version__
from .analysis import DataAnalyzer
from .core import MadMiner
from .delphes import DelphesReader
Expand Down Expand Up @@ -50,19 +49,3 @@
iid_nuisance_parameters,
nominal_nuisance_parameters,
)


import logging

logging.getLogger("madminer").addHandler(logging.NullHandler())
logger = logging.getLogger(__name__)

logger.info("")
logger.info("|{}|".format("-" * 74))
logger.info("|{}|".format(" " * 74))
logger.info("|{}|".format(" MadMiner v{}".format(__version__).ljust(74)))
logger.info("|{}|".format(" " * 74))
logger.info("|{}|".format(" {}".format(__authors__).ljust(74)))
logger.info("|{}|".format(" " * 74))
logger.info("|{}|".format("-" * 74))
logger.info("")
54 changes: 54 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
[metadata]
name = madminer
version = file: VERSION
url = https://github.com/madminer-tool/madminer
description = Mining gold from MadGraph to improve limit setting in particle physics.
long_description = file: README.md
long_description_content_type = text/markdown
author = Johann Brehmer, Felix Kling, Irina Espejo, Sinclert Perez, Kyle Cranmer
author_email = [email protected]
license = MIT
project_urls =
Documentation = https://madminer.readthedocs.io/en/latest/
Source Code = https://github.com/madminer-tool/madminer
Issue Tracker = https://github.com/madminer-tool/madminer/issues
classifiers =
License :: OSI Approved :: MIT License
Topic :: Scientific/Engineering
Topic :: Scientific/Engineering :: Physics
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
packages = find:
python_requires = >=3.7, <4.0
install_requires =
h5py
matplotlib>=2.0.0
numpy>=1.20.0
particle>=0.16.0
scipy>=1.0.0
torch>=1.0.0
uproot3>=3.14.1
vector>=0.8.4

[options.packages.find]
exclude =
tests

[options.extras_require]
docs =
myst-parser
numpydoc
sphinx>=1.4
sphinx_rtd_theme
lint =
black[jupyter]>=21.8b0
test =
pytest
examples =
bqplot
pandas
90 changes: 0 additions & 90 deletions setup.py

This file was deleted.

0 comments on commit 60b7fd5

Please sign in to comment.