Merge branch 'develop' into documentation

This commit is contained in:
fjosw 2022-05-19 13:40:51 +00:00
commit 9f77c34e91
3 changed files with 21 additions and 7 deletions

View file

@ -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
```

View file

@ -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()

View file

@ -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'
],
)