Skip to content

Commit 65973c9

Browse files
committed
Improved installation
1 parent 025f4af commit 65973c9

3 files changed

Lines changed: 13 additions & 14 deletions

File tree

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
recursive-include pysatMagVect *.txt

pysatMagVect/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.2
1+
0.1.4

setup.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import setuptools
55
import numpy.distutils.core
66
import os
7-
import sys
8-
import numpy as np
97

108
from numpy.distutils.misc_util import Configuration
11-
from numpy.distutils.command.sdist import sdist as sdist
9+
# from numpy.distutils.command.sdist import sdist as sdist
1210

1311
config = Configuration('pysatMagVect')
1412

@@ -17,29 +15,29 @@
1715
sources = [os.path.join('pysatMagVect', 'igrf12.f')]
1816
)
1917

20-
# here = os.path.abspath(os.path.dirname(__file__))
21-
# #with open(path.join(here, 'description.txt'), encoding='utf-8') as f:
22-
# # long_description = f.read()
23-
# version_filename = os.path.join('pysatMagVect', 'version.txt')
24-
# with open(os.path.join(here, version_filename)) as version_file:
25-
# version = version_file.read().strip()
18+
here = os.path.abspath(os.path.dirname(__file__))
19+
#with open(path.join(here, 'description.txt'), encoding='utf-8') as f:
20+
# long_description = f.read()
21+
version_filename = os.path.join('pysatMagVect', 'version.txt')
22+
with open(os.path.join(here, version_filename)) as version_file:
23+
version = version_file.read().strip()
2624

2725
# call setup
2826
#--------------------------------------------------------------------------
2927
numpy.distutils.core.setup(
3028

3129
name = 'pysatMagVect',
32-
version = '0.1.3',
30+
version = version,
3331
packages = ['pysatMagVect','pysatMagVect.tests'],
3432
description= ''.join(('Calculates geomagnetic unit vectors (field aligned, zonal, and meridional) '
3533
'and includes supporting routines for characterizing the motion of ionospheric plasma.')),
36-
# cmdclass={'sdist': numpy.distutils.command.sdist},
34+
# cmdclass={'sdist': sdist},
3735

3836
# Author details
3937
author='Russell Stoneback',
4038
author_email='rstoneba@utdallas.edu',
41-
# package_data={'pysatMagVect': ['pysatMagVect/version.txt']},
42-
# include_package_data=True,
39+
package_data={'pysatMagVect': ['pysatMagVect/version.txt']},
40+
include_package_data=True,
4341

4442
ext_modules = config.todict()['ext_modules'],
4543

0 commit comments

Comments
 (0)