Changeset 592cb156 in sasview

Timestamp:

Jan 10, 2012 3:16:21 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

62dc94b

Parents:

70ec588d

Message:

Fix sansmodels as standalone package

Files:

• sansmodels/README.txt (deleted)
• sansmodels/release_notes.txt (deleted)
• sansmodels/setup.py (modified) (4 diffs)
• sansmodels/src/sans/models/__init__.py (modified) (1 diff)
• sansmodels/src/sans/models/sans_extension/__init__.py (added)
• setup.py (modified) (1 diff)

sansmodels/setup.py

@@ -12 +12 @@
 from distutils.core import Extension, setup
 from distutils.command.build_ext import build_ext
+
+# Manage version number ######################################
+sys.path.append(os.path.join("src", "sans"))
+import models
+VERSION = models.__version__
+print "Building models v%s" % VERSION
+##############################################################
 
 # Options to enable OpenMP
@@ -53 +60 @@
 smear_dir  = os.path.join("src", "c_smearer")
 wrapper_dir  = os.path.join("src", "python_wrapper", "generated")
-print "Installing SANS models"
+if not os.path.isdir(wrapper_dir):
+    os.makedirs(wrapper_dir)
 
 sys.path.append(os.path.join("src", "python_wrapper"))
@@ -101 +109 @@
 dist = setup(
     name="sansmodels",
-    version = "1.0.0",
+    version = VERSION,
     description = "Python module for SANS scattering models",
     author = "SANS/DANSE",
     author_email = "sansdanse@gmail.gov",
-    url = "http://danse.us/trac/sans",
+    url = "http://sansviewproject.svn.sourceforge.net",
     
     # Place this module under the sans package
@@ -113 +121 @@
     package_dir = {"sans":os.path.join("src", "sans"),
                    "sans.models":os.path.join("src", "sans", "models"),
-                   "sans.models.sans_extension":includedir,
+                   "sans.models.sans_extension":os.path.join("src", "sans", "models", "sans_extension"),
                   },
     package_data={'sans.models': [os.path.join('media', "*")]},

sansmodels/src/sans/models/__init__.py

@@ -2 +2 @@
     1D Modeling for SANS
 """
-## \mainpage Analytical Modeling for SANS
-#
-# \section intro_sec Introduction
-# This module provides theoretical models for the scattering 
-# intensity for SANS. 
-#
-# Documentation can be found here: 
-#    http://danse.us/trac/sans/wiki/8_2_2_1DModelFitting
-#    http://danse.us/trac/sans/wiki/8_2_3_2DModeling
-#
-# \section install_sec Installation
-#
-# \subsection obtain Obtaining the Code
-#
-# The code is available here:
-# \verbatim
-#$ svn co svn://danse.us/sans/sansmodels
-# \endverbatim
-#
-# \subsection depends External Dependencies
-# None
-#
-# \subsection build Building the code
-# The standard python package can be built with distutils.
-# \verbatim
-#$ python setup.py build
-#$ python setup.py install
-# \endverbatim
-#
-# \section overview_sec Package Overview
-# 
-# \subsection class Class Diagram:
-# \image html class_diag.png
-# Note that the CCylinderModel is written as C code. 
-# CylinderModel acts as an adaptor class for the C extension.
-# Most model classes will be written that way.
-#
-# \subsection behav Behavior enumeration for pyre-level architecture:
-# \image html behavior_pyre.png
-#
-# \subsection behav Behavior enumeration for under-lying architecture:
-# \image html behavior.jpg
-#
-# \subsection Tutorial
-# To create a model:
-# \verbatim
-#from sans.models.CylinderModel import CylinderModel
-#    cyl = CylinderModel()
-# \endverbatim
-#
-# To evaluate a model (at x=0.1 in this example):
-# \verbatim
-#    output = cyl.run(0.1)
-# \endverbatim
-#
-# To change a parameter:
-# \verbatim
-#    cyl.setParam('scale', 0.1)
-# \endverbatim
-#
-# To get the value of a parameter:
-# \verbatim
-#    cyl.getParam('scale')
-# \endverbatim
-#
-# Other examples are available as unit tests under sans.models.test.
-#
-# \section help_sec Contact Info
-# Code and Documentation by Mathieu Doucet as part of the DANSE project.
-#PLUGIN_ID = "models plug-in 0.4"
-from sans.models import *
+#from sans.models import *
 
 import os
 from distutils.filelist import findall
+
+__version__ = "1.1.0"
 
 def get_data_path(media):

setup.py

@@ -263 +263 @@
 package_dir["sans"] = os.path.join("sansmodels", "src", "sans")
 package_dir["sans.models"] = os.path.join("sansmodels", "src", "sans", "models")
-package_dir["sans.models.sans_extension"] = includedir
+package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src", "sans", "models", "sans_extension")
             
 package_data['sans.models'] = [os.path.join('media', "*")]