Skip to content

Commit

Permalink
Improved installation
Browse files Browse the repository at this point in the history
  • Loading branch information
rstoneback committed Jun 28, 2018
1 parent 025f4af commit 65973c9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
recursive-include pysatMagVect *.txt
2 changes: 1 addition & 1 deletion pysatMagVect/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.2
0.1.4
24 changes: 11 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import setuptools
import numpy.distutils.core
import os
import sys
import numpy as np

from numpy.distutils.misc_util import Configuration
from numpy.distutils.command.sdist import sdist as sdist
# from numpy.distutils.command.sdist import sdist as sdist

config = Configuration('pysatMagVect')

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

# here = os.path.abspath(os.path.dirname(__file__))
# #with open(path.join(here, 'description.txt'), encoding='utf-8') as f:
# # long_description = f.read()
# version_filename = os.path.join('pysatMagVect', 'version.txt')
# with open(os.path.join(here, version_filename)) as version_file:
# version = version_file.read().strip()
here = os.path.abspath(os.path.dirname(__file__))
#with open(path.join(here, 'description.txt'), encoding='utf-8') as f:
# long_description = f.read()
version_filename = os.path.join('pysatMagVect', 'version.txt')
with open(os.path.join(here, version_filename)) as version_file:
version = version_file.read().strip()

# call setup
#--------------------------------------------------------------------------
numpy.distutils.core.setup(

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

# Author details
author='Russell Stoneback',
author_email='rstoneba@utdallas.edu',
# package_data={'pysatMagVect': ['pysatMagVect/version.txt']},
# include_package_data=True,
package_data={'pysatMagVect': ['pysatMagVect/version.txt']},
include_package_data=True,

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

Expand Down

0 comments on commit 65973c9

Please sign in to comment.