Skip to content

Commit ea3dfe9

Browse files
author
Darren Dale
committed
improvements for creating source distributions
1 parent 39c0695 commit ea3dfe9

File tree

10 files changed

+64
-55
lines changed

10 files changed

+64
-55
lines changed

‎.eric4project/quantities.e4q‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
33
<!-- eric4 user project file for project quantities -->
4-
<!-- Saved: 2009-01-21, 13:57:13 -->
4+
<!-- Saved: 2009-01-23, 07:19:11 -->
55
<!-- Copyright (C) 2009 , -->
66
<UserProject version="4.0">
77
</UserProject>

‎.eric4project/quantities.e4t‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
33
<!-- eric4 tasks file for project quantities -->
4-
<!-- Saved: 2009-01-21, 13:57:13 -->
4+
<!-- Saved: 2009-01-23, 07:19:11 -->
55
<Tasks version="4.2">
6-
<Task priority="1" completed="False" bugfix="False">
7-
<Summary>TODO: move to physical constants</Summary>
8-
<Description></Description>
9-
<Created>2009-01-14, 14:29:01</Created>
10-
<Resource>
11-
<Filename>quantities/units/electromagnetism.py</Filename>
12-
<Linenumber>144</Linenumber>
13-
</Resource>
14-
</Task>
15-
<Task priority="1" completed="False" bugfix="False">
16-
<Summary>TODO: move to physical constants</Summary>
17-
<Description></Description>
18-
<Created>2009-01-14, 14:29:01</Created>
19-
<Resource>
20-
<Filename>quantities/units/electromagnetism.py</Filename>
21-
<Linenumber>154</Linenumber>
22-
</Resource>
23-
</Task>
246
<Task priority="1" completed="False" bugfix="False">
257
<Summary>TODO: move to constants</Summary>
268
<Description></Description>
@@ -48,10 +30,19 @@
4830
<Linenumber>100</Linenumber>
4931
</Resource>
5032
</Task>
33+
<Task priority="1" completed="False" bugfix="False">
34+
<Summary>TODO: use a regexp:</Summary>
35+
<Description></Description>
36+
<Created>2009-01-23, 06:39:46</Created>
37+
<Resource>
38+
<Filename>quantities/markup.py</Filename>
39+
<Linenumber>11</Linenumber>
40+
</Resource>
41+
</Task>
5142
<Task priority="1" completed="False" bugfix="False">
5243
<Summary>TODO: what is an appropriate value?</Summary>
5344
<Description></Description>
54-
<Created>2009-01-21, 12:40:34</Created>
45+
<Created>2009-01-23, 06:39:51</Created>
5546
<Resource>
5647
<Filename>quantities/quantity.py</Filename>
5748
<Linenumber>62</Linenumber>
@@ -60,16 +51,16 @@
6051
<Task priority="1" completed="False" bugfix="False">
6152
<Summary>TODO: do we want this kind of magic?</Summary>
6253
<Description></Description>
63-
<Created>2009-01-21, 12:40:34</Created>
54+
<Created>2009-01-23, 06:39:51</Created>
6455
<Resource>
6556
<Filename>quantities/quantity.py</Filename>
66-
<Linenumber>379</Linenumber>
57+
<Linenumber>368</Linenumber>
6758
</Resource>
6859
</Task>
6960
<Task priority="1" completed="False" bugfix="False">
7061
<Summary>TODO: what is an appropriate value?</Summary>
7162
<Description></Description>
72-
<Created>2009-01-21, 13:52:50</Created>
63+
<Created>2009-01-23, 06:40:01</Created>
7364
<Resource>
7465
<Filename>quantities/uncertainquantity.py</Filename>
7566
<Linenumber>14</Linenumber>

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include quantities-data/NIST_codata.txt

‎README‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
to install quantities, run the following in the source directory:
2+
3+
python setup.py install
4+
5+
By default, quantities uses Unicode to present units, which can be
6+
problematic on some platforms like windows. Unicode can be disabled
7+
by doing:
8+
9+
python setup.py install --no-unicode

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

File renamed without changes.

‎quantities.egg-info/PKG-INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 1.1
22
Name: quantities
3-
Version: 0.5a1
3+
Version: 0.5a3
44
Summary: Support for physical quantities based on the popular numpy library
55
Home-page: http://packages.python.org/quantities
66
Author: Darren Dale
@@ -21,4 +21,4 @@ Classifier: Operating System :: OS Independent
2121
Classifier: Programming Language :: Python
2222
Classifier: Topic :: Education
2323
Classifier: Topic :: Scientific/Engineering
24-
Requires: numpy
24+
Requires: numpy (>=1.2)

‎quantities.egg-info/SOURCES.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
MANIFEST.in
2+
README
13
setup.py
24
quantities/__init__.py
35
quantities/config.py
@@ -8,6 +10,7 @@ quantities/quantity.py
810
quantities/registry.py
911
quantities/uncertainquantity.py
1012
quantities/unitquantity.py
13+
quantities-data/NIST_codata.txt
1114
quantities.egg-info/PKG-INFO
1215
quantities.egg-info/SOURCES.txt
1316
quantities.egg-info/dependency_links.txt

‎quantities/__init__.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
+/-1.6*J**2 (1 sigma)
7878
"""
7979

80-
from __future__ import absolute_import
80+
#from __future__ import absolute_import
8181

82-
__version__ = '0.5a2'
82+
__version__ = '0.5a3'
8383

84-
from .quantity import Quantity
85-
from .uncertainquantity import UncertainQuantity
86-
from .unitquantity import *
84+
from quantity import Quantity
85+
from uncertainquantity import UncertainQuantity
86+
from unitquantity import *
8787

88-
from .units import *
88+
from units import *
8989

90-
from . import constants
90+
import constants

‎quantities/constants/__init__.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
from __future__ import absolute_import
1+
#from __future__ import absolute_import
22

3-
from .alpha import *
4-
from .astronomy import *
5-
from .atomicunits import *
6-
from .deuteron import *
7-
from .electromagnetism import *
8-
from .electron import *
9-
from .helion import *
10-
from .mathematical import *
11-
from .muon import *
12-
from .naturalunits import *
13-
from .neutron import *
14-
from .proton import *
15-
from .quantum import *
16-
from .relationships import *
17-
from .statisticalmechanics import *
18-
from .tau import *
19-
from .triton import *
20-
from .weak import *
21-
from .xray import *
3+
from alpha import *
4+
from astronomy import *
5+
from atomicunits import *
6+
from deuteron import *
7+
from electromagnetism import *
8+
from electron import *
9+
from helion import *
10+
from mathematical import *
11+
from muon import *
12+
from naturalunits import *
13+
from neutron import *
14+
from proton import *
15+
from quantum import *
16+
from relationships import *
17+
from statisticalmechanics import *
18+
from tau import *
19+
from triton import *
20+
from weak import *
21+
from xray import *

‎setup.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,19 @@
3030

3131
from __future__ import with_statement
3232

33+
import os
3334
import sys
3435

3536
try:
3637
from setuptools import setup
3738
except ImportError:
3839
from numpy.distutils.core import setup
3940

40-
with file('quantities/quantities-data/NIST_codata.txt') as f:
41+
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
42+
43+
MIN_NUMPY = '1.2'
44+
45+
with file('quantities-data/NIST_codata.txt') as f:
4146
data = f.read()
4247
data = data.split('\n')[10:-1]
4348

@@ -112,5 +117,5 @@
112117
'quantities.constants',
113118
'quantities.tests'
114119
],
115-
test_suite = 'nose.collector',
120+
requires = ['numpy (>=%s)' % MIN_NUMPY],
116121
)

0 commit comments

Comments
 (0)