From 477573593c8bd6e25522ac230e243f62e10370bf Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 19 May 2022 09:59:40 +0100 Subject: [PATCH 1/4] build: long description added to setup.py, autograd dependency changed to pypi version. --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5a971d92..c28faf2c 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,18 @@ #!/usr/bin/env python from setuptools import setup, find_packages +from pathlib import Path +this_directory = Path(__file__).parent +long_description = (this_directory / "README.md").read_text() setup(name='pyerrors', version='2.0.0', description='Error analysis for lattice QCD', + long_description=long_description, + long_description_content_type='text/markdown', author='Fabian Joswig', author_email='fabian.joswig@ed.ac.uk', packages=find_packages(), python_requires='>=3.6.0', - install_requires=['numpy>=1.16', 'autograd @ git+https://github.com/HIPS/autograd.git', 'numdifftools', 'matplotlib>=3.3', 'scipy', 'iminuit>=2', 'h5py'] + install_requires=['numpy>=1.16', 'autograd>=1.4', 'numdifftools', 'matplotlib>=3.3', 'scipy', 'iminuit>=2', 'h5py'] ) From cfe6d9c83559b7d7b14738e7c87d375093e65a16 Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 19 May 2022 10:36:22 +0100 Subject: [PATCH 2/4] build: url, license and classifiers added to setup.py --- setup.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc4533ef..ef3fb3f8 100644 --- a/setup.py +++ b/setup.py @@ -8,9 +8,22 @@ setup(name='pyerrors', description='Error analysis for lattice QCD', long_description=long_description, long_description_content_type='text/markdown', + url="https://github.com/fjosw/pyerrors", author='Fabian Joswig', author_email='fabian.joswig@ed.ac.uk', + license="MIT", packages=find_packages(), python_requires='>=3.6.0', - install_requires=['numpy>=1.16', 'autograd>=1.4', 'numdifftools', 'matplotlib>=3.3', 'scipy', 'iminuit>=2', 'h5py', 'lxml', 'python-rapidjson'] + install_requires=['numpy>=1.16', 'autograd>=1.4', 'numdifftools', 'matplotlib>=3.3', 'scipy', 'iminuit>=2', 'h5py', 'lxml', 'python-rapidjson'], + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Topic :: Scientific/Engineering' + ], ) From 16d288e3b9a38b5d36f5a2af8e1769d74c3065ad Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 19 May 2022 10:43:11 +0100 Subject: [PATCH 3/4] docs: README updated. --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 67d59be0..e1f124ca 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,12 @@ - **Bug reports:** https://github.com/fjosw/pyerrors/issues ## Installation -To install the current `develop` version run +To install the most recent release run +```bash +pip install pyerrors # Fresh install +pip install -U pyerrors # Upgrade +``` +to install the current `develop` version run ```bash pip install git+https://github.com/fjosw/pyerrors.git@develop ``` -to install the most recent release run -```bash -pip install git+https://github.com/fjosw/pyerrors.git@master -``` From 5f7adf839f32626ac6c8a9ff99c7c6a894baaffa Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 19 May 2022 14:39:57 +0100 Subject: [PATCH 4/4] build: json.gz format version bumped to 1.1 --- pyerrors/input/json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyerrors/input/json.py b/pyerrors/input/json.py index ac7963cc..31639287 100644 --- a/pyerrors/input/json.py +++ b/pyerrors/input/json.py @@ -165,7 +165,7 @@ def create_json_string(ol, description='', indent=1): d = {} d['program'] = 'pyerrors %s' % (pyerrorsversion.__version__) - d['version'] = '1.0' + d['version'] = '1.1' d['who'] = getpass.getuser() d['date'] = datetime.datetime.now().astimezone().strftime('%Y-%m-%d %H:%M:%S %z') d['host'] = socket.gethostname() + ', ' + platform.platform()