Merge pull request #21 from dhidas/dev

dhidas · web-flow · commit 648394ab507f · 2017-05-12T22:14:20.000-04:00
python 2.7 init fix
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ conda install -n root git
 conda install -n root pyyaml
 
 # Download OSCARS
-git clone https://github.com/dhidas/OSCARS -b 1.36.04
+git clone https://github.com/dhidas/OSCARS -b 1.36.06
 
 # Create a new "conda environment" and install the required Python packages.
 cd OSCARS
@@ -68,7 +68,7 @@ conda install -n root git
 conda install -n root pyyaml
 
 # Download OSCARS
-git clone https://github.com/dhidas/OSCARS -b 1.36.04
+git clone https://github.com/dhidas/OSCARS -b 1.36.06
 
 # Create a new "conda environment" and install the required Python packages.
 cd OSCARS
diff --git a/include/Version.h b/include/Version.h
@@ -8,7 +8,7 @@
 
 #define OSCARS_VMAJOR 1
 #define OSCARS_VMINOR 36
-#define OSCARS_REVISION 4
+#define OSCARS_REVISION 6
 
 namespace OSCARS {
 
diff --git a/oscars/__init__.py b/oscars/__init__.py
@@ -0,0 +1 @@
+__all__ = ["sr", "th", "parametric_surfaces", "plots_mpl", "plots3d_mpl"]
diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@
 
 setup(
   name="oscars",
-  version="1.36.04",
+  version="1.36.06",
   description = 'Open Source Code for Advanced Radiation Simulation',
   author = 'Dean Andrew Hidas',
   author_email = 'dhidas@bnl.gov',
diff --git a/setup_gpu.py b/setup_gpu.py
@@ -60,7 +60,7 @@
 
 setup(
   name="oscars",
-  version="1.36.04",
+  version="1.36.06",
   description = 'Open Source Code for Advanced Radiation Simulation',
   author = 'Dean Andrew Hidas',
   author_email = 'dhidas@bnl.gov',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+__all__ = ["sr", "th", "parametric_surfaces", "plots_mpl", "plots3d_mpl"]`