Changeset 422

Timestamp:

13/10/15 15:38:59 (6 years ago)

Author:

mjuckes

Message:

miscellaneous cleaning for package installation

Location:

CMIP6dreq

Files:

• manage/README.txt (modified) (1 diff)
• manage/step1.py (modified) (2 diffs)
• tags/01.beta.05/README.txt (modified) (1 diff)
• tags/01.beta.05/setup.py (modified) (1 diff)
• tags/01.beta.06/dreqPy/__init__.py (modified) (1 diff)
• tags/01.beta.06/setup.py (modified) (1 diff)
• trunk/README.txt (modified) (1 diff)

CMIP6dreq/manage/README.txt

@@ -7 +7 @@
 bash step2.sh    ## checks trunk into repository, creates tagged version
 
+
+To upload to pypi test server:
+python setup.py register -r pypitest
+
+python setup.py sdist upload -r pypitest
+
+Same without test for full version.
+
+01.beta.07 is on pypi
+
+
+Note that there is now duplication in the version specification in __init__.py, which is the clean approach, and versionConfig.py which was my hack.
+
+

CMIP6dreq/manage/step1.py

@@ -17 +17 @@
 ii = string.join( open( 'versionConfig.tmpl' ).readlines() )
 tags = glob.glob( '../tags/*' )
+
 f1 = lambda x: map( int, string.split(x, '.' ) )
 def f1( vs ):
+  if vs == 'latest':
+    return (0,0)
   bits = string.split(vs, '.' )
   estr = 'Version string should be "nn.nn" or "nn.[alpha|beta].nn": %s' % vs
@@ -56 +59 @@
   assert thistn > tn[-1], 'Requested tag not greater than last tag: %s' % str(tn[-1])
 
-oo = open( '../trunk/src/versionConfig.py', 'w' )
+oo = open( '../trunk/dreqPy/versionConfig.py', 'w' )
 for l in string.split( ii % (thistag, thiscomment), '\n' ):
   oo.write( '%s\n' % string.strip(l) )

CMIP6dreq/tags/01.beta.05/README.txt

@@ -1 +1 @@
 
 
-python ptxt.py: to generate schema and sample from vocabDefn.txt
- [Need to edit file to switch modes]
-Produces vocabDefn.xml  vocabSample.xml
+The dreqPy package includes an XML document specifying the CMIP6 data request and a python API.
 
-test vocabDefn.xml
+The XML document is described in dreqML.pdf in the docs directory.
 
-xmllint --schema ../../docs/vocabFrameworkSchema.xsd out/vocabDefn.xml
-
-use xsltproc to generate schema from vocabDefn.xml
-
-xsltproc ../../docs/xlst_xdsSchemaGen.xml out/vocabDefn.xml > out/vocab.xsd
-
-check vocabSample.xml
-
-xmllint --schema out/vocab.xsd out/vocabSample.xml
+The python API is described in dreqPy.pdf, also in the docs directory.

CMIP6dreq/tags/01.beta.05/setup.py

@@ -90 +90 @@
         classifiers=CLASSIFIERS,
         install_requires=INSTALL_REQUIRES,
-        data_files = [("", ["LICENSE"])]
+        package_data={'dreqPy': ['LICENSE', 'docs/*.txt']}
     )

CMIP6dreq/tags/01.beta.06/dreqPy/__init__.py

@@ -1 +1 @@
 
 
-__version__ = "01.beta.05"
+__version__ = "01.beta.06"
 __title__ = "dreqPy"
 __description__ = "CMIP6 Data Request Python API"

CMIP6dreq/tags/01.beta.06/setup.py

@@ -89 +89 @@
         zip_safe=False,
         classifiers=CLASSIFIERS,
-        install_requires=INSTALL_REQUIRES,
-        package_data={'dreqPy': ['LICENSE', 'docs/*.txt']}
+        install_requires=INSTALL_REQUIRES
     )

CMIP6dreq/trunk/README.txt

@@ -1 +1 @@
 
 
-python ptxt.py: to generate schema and sample from vocabDefn.txt
- [Need to edit file to switch modes]
-Produces vocabDefn.xml  vocabSample.xml
+The dreqPy package includes an XML document specifying the CMIP6 data request and a python API.
 
-test vocabDefn.xml
+The XML document is described in dreqML.pdf in the docs directory.
 
-xmllint --schema ../../docs/vocabFrameworkSchema.xsd out/vocabDefn.xml
-
-use xsltproc to generate schema from vocabDefn.xml
-
-xsltproc ../../docs/xlst_xdsSchemaGen.xml out/vocabDefn.xml > out/vocab.xsd
-
-check vocabSample.xml
-
-xmllint --schema out/vocab.xsd out/vocabSample.xml
+The python API is described in dreqPy.pdf, also in the docs directory.