Skip to content

Commit 67437e2

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # gempy/modules/data_manipulation/manipulate_points.py
2 parents 2b8dabb + 2e1bcfd commit 67437e2

File tree

9 files changed

+1201
-262
lines changed

9 files changed

+1201
-262
lines changed

DevelopersGuide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Github release
1616
# push git tag
1717
$ git push --tags origin master
1818

19-
PyPi release
19+
PyPi release:
2020
------------
2121
New
2222
```

docs/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
pyvista.set_error_output_file('errors.txt')
3838
pyvista.OFF_SCREEN = True # Not necessary - simply an insurance policy. Ensure that offscreen rendering is used for docs generation
3939
pyvista.set_plot_theme('document') # Preferred plotting style for documentation
40-
# pyvista.rcParams['window_size'] = np.array([1024, 768]) * 2
4140
pyvista.FIGURE_PATH = os.path.join(os.path.abspath('_images/'), 'auto-generated/') # Save figures in specified directory
4241
pyvista.BUILDING_GALLERY = True
4342
if not os.path.exists(pyvista.FIGURE_PATH):

0 commit comments

Comments
 (0)