Skip to content

Commit

Permalink
add __future__ annotation
Browse files Browse the repository at this point in the history
  • Loading branch information
joshua-atolagbe committed May 5, 2023
1 parent 65d210f commit 7f035c9
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "petrolib"
version = "1.2.4.1"
version = "1.2.5"
authors = [
{name="Joshua Atolagbe", email="atolagbejoshua2@gmail.com"},
]
Expand All @@ -23,8 +23,8 @@ dependencies = ['matplotlib', 'pandas', 'numpy', 'lasio',
'scipy', 'seaborn', 'geopandas', 'contextily']

[project.urls]
"Homepage" = "https://github.com/mayor-of-geology/petrolib"
"Bug Tracker" = "https://github.com/mayor-of-geology/petrolib/issues"
"Homepage" = "https://github.com/joshua-atolagbe/petrolib"
"Bug Tracker" = "https://github.com/joshua-atolagbe/petrolib/issues"

[tool.setuptools.packages.find]
namespaces = true
Expand Down
2 changes: 1 addition & 1 deletion src/petrolib/file_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
load_las
load_table
'''

from __future__ import annotations
from pathlib import Path
from warnings import filterwarnings
filterwarnings('ignore')
Expand Down
2 changes: 1 addition & 1 deletion src/petrolib/interp.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
crossPlot
picketPlot
'''

from __future__ import annotations
import seaborn as sns
import numpy as np
import pandas as pd
Expand Down
1 change: 1 addition & 0 deletions src/petrolib/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
plotLogFacies
plotLogs
'''
from __future__ import annotations


import numpy as np
Expand Down
1 change: 1 addition & 0 deletions src/petrolib/procs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
model_facies
'''
from __future__ import annotations

from warnings import filterwarnings
filterwarnings('ignore')
Expand Down
1 change: 1 addition & 0 deletions src/petrolib/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
'''

from __future__ import annotations

from warnings import filterwarnings
filterwarnings('ignore')
Expand Down
20 changes: 10 additions & 10 deletions src/petrolib/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def _filter(self):

return self._results, data

def vshale(self, method:str='linear', show_plot:bool=False, palette_op:str=None, figsize:slice=None):
def vshale(self, method:str='linear', show_plot:bool=False, palette_op:str=None, figsize:tuple=None):

'''
Expand All @@ -214,7 +214,7 @@ def vshale(self, method:str='linear', show_plot:bool=False, palette_op:str=None,
palette_op: str default None
Palette option for to color code vshale plot. Check https://matplotlib.org/stable/tutorials/colors/colormaps.html
figsize: slice default None
figsize: tuple default None
Size of plot
Returns
Expand Down Expand Up @@ -357,7 +357,7 @@ def vshale(self, method:str='linear', show_plot:bool=False, palette_op:str=None,
return new_data

def porosity(self, method:str='density', rhob_shale:float=2.4, rhob_fluid:float=1.,
rhob_matrix:float=2.65, fzs:float=None, show_plot:bool=False, figsize:slice=None):
rhob_matrix:float=2.65, fzs:float=None, show_plot:bool=False, figsize:tuple=None):

'''
Computes the effective and total porosities using the 'density' and Wyllie's 'sonic' method.
Expand All @@ -383,7 +383,7 @@ def porosity(self, method:str='density', rhob_shale:float=2.4, rhob_fluid:float=
show_plot : bool default False
Display plot if True.. Plots RHOB, VSH, PHIE/PHIT and Zone track
figsize: slice default None
figsize: tuple default None
Size of plot
Returns
Expand Down Expand Up @@ -551,7 +551,7 @@ def porosity(self, method:str='density', rhob_shale:float=2.4, rhob_fluid:float=
return new_data

def water_saturation(self, method:str='archie', rw:float=0.03, a:float=1., m:float=2., n:float=2.,
show_plot:bool=False, figsize:slice=None):
show_plot:bool=False, figsize:tuple=None):


'''
Expand Down Expand Up @@ -579,7 +579,7 @@ def water_saturation(self, method:str='archie', rw:float=0.03, a:float=1., m:flo
show_plot : bool default False
Display plot if True.. Plots RT, SW, PHIE/PHIT and Zone track
figsize: slice default None
figsize: tuple default None
Size of plot
Returns
Expand Down Expand Up @@ -748,7 +748,7 @@ def water_saturation(self, method:str='archie', rw:float=0.03, a:float=1., m:flo

return new_data

def permeability(self, show_plot:bool=False, figsize:slice=None):
def permeability(self, show_plot:bool=False, figsize:tuple=None):

'''
Expand All @@ -760,7 +760,7 @@ def permeability(self, show_plot:bool=False, figsize:slice=None):
show_plot : bool default False
Display plot if True.. Plots PHIE, Permeability and Zone track
figsize: slice default None
figsize: tuple default None
Size of plot
Returns
Expand Down Expand Up @@ -871,7 +871,7 @@ def permeability(self, show_plot:bool=False, figsize:slice=None):
return new_data

def flags(self, vsh_cutoff:float, por_cutoff:float, sw_cutoff:float,
ref_unit:str='m', show_plot:bool=False, palette_op:str=None, figsize:slice=None):
ref_unit:str='m', show_plot:bool=False, palette_op:str=None, figsize:tuple=None):

'''
Expand Down Expand Up @@ -901,7 +901,7 @@ def flags(self, vsh_cutoff:float, por_cutoff:float, sw_cutoff:float,
palette_op : str default None
palette option for VSH coloring. Check https://matplotlib.org/stable/tutorials/colors/colormaps.html for availabel palette options
figsize: slice default None
figsize: tuple default None
Size of plot
Returns
Expand Down

0 comments on commit 7f035c9

Please sign in to comment.