FIxed, now have working package test

ICWallis · Sep 14, 2024 · 9d7be54 · 9d7be54
1 parent 8823c31
commit 9d7be54
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 34 deletions.
diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,4 @@
-name: fractoolbox
+name: fractoolbox_env
 channels:
   - defaults
 dependencies:

diff --git a/fractoolbox/README.md b/fractoolbox/README.md
diff --git a/fractoolbox/__init__.py b/fractoolbox/__init__.py
@@ -1,42 +1,42 @@
 
 
-from src.conversion import dip2strike
-from src.conversion import strike2dip
+from .conversion import dip2strike
+from .conversion import strike2dipaz
 
 
-from src.geometric_bias import (
+from .geometric_bias import (
     unitvectorx,
     unitvectory,
     unitvectorz,
     isogeniccontour,
 )
 
-from src.mohr_plot import (
+from .mohr_plot import (
     sigma_m,
     tau_s,
     sigma_n,
     mohr3d,
 )
 
-from src.hoop_stress import (
+from .hoop_stress import (
     thermal_stress,
     theta,
     effhoopstress,
 )
 
-from src.transform_stress_tensor import (
+from .transform_stress_tensor import (
     Rs,
     Rf,
     rake,
     Rt,
     fracture_sn_tau,
 )
 
-from src.stress_models import (
+from .stress_models import (
     linear_Sv,
 )
 
-from src.stress_polygon import (
+from .stress_polygon import (
     minstress,
     maxstress,
     poly,

diff --git a/fractoolbox/src/conversion.py → fractoolbox/conversion.py b/fractoolbox/src/conversion.py → fractoolbox/conversion.py
diff --git a/fractoolbox/src/geometric_bias.py → fractoolbox/geometric_bias.py b/fractoolbox/src/geometric_bias.py → fractoolbox/geometric_bias.py
diff --git a/fractoolbox/src/hoop_stress.py → fractoolbox/hoop_stress.py b/fractoolbox/src/hoop_stress.py → fractoolbox/hoop_stress.py
diff --git a/fractoolbox/src/mohr_plot.py → fractoolbox/mohr_plot.py b/fractoolbox/src/mohr_plot.py → fractoolbox/mohr_plot.py
diff --git a/fractoolbox/src/__init__.py b/fractoolbox/src/__init__.py
diff --git a/fractoolbox/src/stress_models.py → fractoolbox/stress_models.py b/fractoolbox/src/stress_models.py → fractoolbox/stress_models.py
diff --git a/fractoolbox/src/stress_polygon.py → fractoolbox/stress_polygon.py b/fractoolbox/src/stress_polygon.py → fractoolbox/stress_polygon.py
diff --git a/fractoolbox/tests/__init__.py b/fractoolbox/tests/__init__.py
diff --git a/fractoolbox/src/transform_stress_tensor.py → fractoolbox/transform_stress_tensor.py b/fractoolbox/src/transform_stress_tensor.py → fractoolbox/transform_stress_tensor.py
diff --git a/run.py b/run.py
@@ -1,10 +1,11 @@
 import sys
 import os
 
-sys.path.append(os.path.join(os.path.dirname(__file__), 'fractoolbox'))
+# sys.path.append(os.path.join(os.path.dirname(__file__), 'fractoolbox'))
 
 
-import fractoolbox as ftb
+from fractoolbox import dip2strike, thermal_stress
 
-strike = ftb.dip2strike(45)
-print(strike)
+print(dip2strike(30))
+
+print(thermal_stress(34, 2, 33, 22, 60))
diff --git a/setup.py b/setup.py
@@ -1,3 +1,32 @@
+# from setuptools import setup, find_packages
+
+# setup(
+#     name='fractoolbox',
+#     version='0.1.1',
+#     packages=find_packages(),
+#     install_requires=[
+#         # Add your package dependencies here
+#     ],
+#     # entry_points={
+#     #     'console_scripts': [
+#     #         # Add command line scripts here
+#     #     ],
+#     # },
+#     author='Irene Wallis',
+#     author_email='irene@cubicearth.nz',
+#     description='A toolbox for structural geology, borehole image analysis, and geomechanics',
+#     #long_description=open('README.md').read(),
+#     #long_description_content_type='text/markdown',
+#     #url='https://github.com/yourusername/sharkie',
+#     classifiers=[
+#         'Programming Language :: Python :: 3',
+#         'License :: OSI Approved :: MIT License',
+#         'Operating System :: OS Independent',
+#     ],
+#     python_requires='>=3.6',
+# )
+
+
 from setuptools import find_packages, setup
 
 # with open("app/README.md", "r") as f:
@@ -7,8 +36,8 @@
     name="fractoolbox",
     version="0.0.0",
     description="A toolbox for structural geology, borehole image analysis, and geomechanics",
-    package_dir={"": "fractoolbox"},
-    packages=find_packages(where="fractoolbox"),
+    # package_dir={"": "fractoolbox"},
+    packages=find_packages(),
     long_description= "Long description TBC", # long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/ICWallis/fractoolbox",