Skip to content

Commit 490e395

Browse files
ddaleddale
committed
removed egg-info directory
moved NIST_codata.txt so it can be installed along with the constants updated MANIFEST.in to include tests minorr formatting change for reprs
1 parent f5a8624 commit 490e395

10 files changed

Lines changed: 16 additions & 109 deletions

File tree

‎MANIFEST.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
include quantities-data/NIST_codata.txt
1+
include quantities/constants/NIST_codata.txt
2+
include quantities/tests/*.py
3+
include quantities/umath/tests/*.py

‎quantities.egg-info/PKG-INFO‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎quantities.egg-info/SOURCES.txt‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎quantities.egg-info/dependency_links.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎quantities.egg-info/top_level.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎quantities/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225

226226
#from __future__ import absolute_import
227227

228-
__version__ = '0.5b2'
228+
__version__ = '0.5b3'
229229

230230
import quantity
231231
from quantity import Quantity

quantities-data/NIST_codata.txt renamed to quantities/constants/NIST_codata.txt

File renamed without changes.

‎quantities/quantity.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def __rpow__(self, other):
352352

353353
@with_doc(numpy.ndarray.__repr__)
354354
def __repr__(self):
355-
return '%s*%s'%(
355+
return '%s * %s'%(
356356
repr(self.magnitude), repr(self.dimensionality)
357357
)
358358

‎quantities/unitquantity.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def _set_units(self, units):
138138
def __repr__(self):
139139
ref = self._definition
140140
if ref:
141-
ref = ', %s*%s'%(str(ref.magnitude), repr(ref.dimensionality))
141+
ref = ', %s * %s'%(str(ref.magnitude), repr(ref.dimensionality))
142142
else:
143143
ref = ''
144144
symbol = self._symbol

‎setup.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@
3333
import os
3434
import sys
3535

36-
from numpy.distutils.core import setup
36+
from distutils.core import setup
3737

3838
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
3939

40-
MIN_NUMPY = '1.2'
41-
42-
with file('quantities-data/NIST_codata.txt') as f:
40+
with file('quantities/constants/NIST_codata.txt') as f:
4341
data = f.read()
4442
data = data.split('\n')[10:-1]
4543

@@ -62,19 +60,20 @@
6260
USE_UNICODE = False
6361
sys.argv.remove(arg)
6462
with file('quantities/config.py', 'w') as f:
65-
6663
f.write('# THIS FILE IS AUTOMATICALLY GENERATED AT BUILD TIME\n')
6764
f.write('# ANY CHANGES MADE HERE WILL BE LOST\n')
6865
f.write('# PASS --no-unicode FLAG TO setup.py TO DISABLE UNICODE\n\n')
6966
f.write('USE_UNICODE = %s'% USE_UNICODE)
7067

7168
desc = 'Support for physical quantities based on the popular numpy library'
69+
7270
long_desc = "Quantities is designed to handle arithmetic and conversions of \
7371
physical quantities, which have a magnitude, dimensionality specified by \
7472
various units, and possibly an uncertainty. Quantities is based on the popular \
7573
numpy library. It is undergoing active development, and while the current \
7674
features and API are fairly stable, test coverage is far from complete and the \
7775
package is not ready for production use."
76+
7877
classifiers = [
7978
'Development Status :: 3 - Alpha',
8079
'Environment :: Console',
@@ -95,6 +94,10 @@
9594
exec(line)
9695
break
9796

97+
package_data = {
98+
'quantities':['tests/*', 'umath/tests/*', 'constants/NIST_codata.txt']
99+
}
100+
98101
setup(
99102
name = "quantities",
100103
version = __version__,
@@ -111,8 +114,8 @@
111114
'quantities',
112115
'quantities.units',
113116
'quantities.constants',
114-
'quantities.tests',
115117
'quantities.umath'
116118
],
117-
requires = ['numpy (>=%s)' % MIN_NUMPY],
119+
package_data = package_data,
120+
requires = ['numpy (>=1.2)'],
118121
)

0 commit comments

Comments
 (0)