Skip to content
This repository has been archived by the owner on Aug 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request #235 from dstansby/setupcfg
Browse files Browse the repository at this point in the history
Use setup.cfg
  • Loading branch information
dstansby authored Oct 2, 2020
2 parents 409be69 + b786667 commit 963b095
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 46 deletions.
3 changes: 2 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ formats: all
python:
version: 3.7
install:
- requirements: requirements/docs.txt
- method: pip
path: .
extra_requirements:
- docs
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ before_install:

# Have to install numpy first to make streamtracer work
- python -m pip install numpy
- python -m pip install -r requirements/test.txt
- $EXTRAS

install:
- python -m pip install -e .
- python -m pip install -e .[test]

script:
# Check that unit tests work
Expand Down
5 changes: 0 additions & 5 deletions requirements/base.txt

This file was deleted.

13 changes: 0 additions & 13 deletions requirements/docs.txt

This file was deleted.

6 changes: 0 additions & 6 deletions requirements/test.txt

This file was deleted.

59 changes: 59 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,62 @@
[metadata]
name = pfsspy
provides = pfsspy
description = "Potential field source surface modelling"
long_description = file: README.md
long_description_content_type = text/markdown
author = David Stansby
author_email = [email protected]
license = GPLv3
license_file = LICENSE
url = https://pfsspy.readthedocs.io/en/stable/
edit_on_github = True
github_project = dstansby/pfsspy
platform = any
keywords = solar physics, solar, science, sun
classifiers =
Development Status :: 4 - Beta
Intended Audience :: Science/Research
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Topic :: Scientific/Engineering :: Physics

[options]
zip_safe = False
python_requires = >=3.6
packages = pfsspy
include_package_data = True
install_requires =
astropy>=3
matplotlib
numpy
scipy
sunpy
scikit-image

[options.extras_require]
docs =
sunpy!=2.0.2
graphviz
pillow
reproject
sphinx-automodapi>=0.10
sphinx_rtd_theme
sphinx-gallery
sphinx>2
bs4
drms
zeep
importlib_metadata
test =
pytest
pytest-cov
streamtracer
reproject

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
Expand Down
21 changes: 2 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,5 @@
if sys.version_info < (3, 5):
sys.exit('Python versions older than 3.5 are not supported.')

setup(name='pfsspy',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description='Potential Field Source Surface model package',
author='David Stansby',
license='GPL3',
author_email='[email protected]',
classifiers=['Development Status :: 4 - Beta',
'Environment :: Console',
'Intended Audience :: Science/Research',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Topic :: Scientific/Engineering :: Physics'],
url='https://github.com/dstansby/pfsspy',
install_requires=['numpy', 'scipy', 'sunpy!=2.0.2', 'astropy>=3',
'scikit-image'],
python_requires='>=3.5',
packages=['pfsspy'],
)
setup(version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass())
5 changes: 5 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import sunpy.map
import pfsspy

m = sunpy.map.Map('/Users/dstansby/sunpy/data/hmi.mrsynop_small_720s.2210.synopMr.fits')
print(m)

0 comments on commit 963b095

Please sign in to comment.