Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gempy v2023.1.0 #796

Merged
merged 85 commits into from
Jun 20, 2023
Merged

Gempy v2023.1.0 #796

merged 85 commits into from
Jun 20, 2023

Conversation

Japhiolite
Copy link
Collaborator

Description

this PR includes changes by Andrew concerning switch to Aesara and multiple bugfixes

Relates to #706 #754

Checklist

  • My code follows the PEP 8 style guidelines.
  • My code uses type hinting for function and method arguments and return values.
  • My code contains descriptive and helpful docstrings
    which are formatted per the Google Python Style Guidelines.
  • I have created tests which entirely cover my code.
  • The test code either 1. demonstrates at least one valuable use case (e.g. integration tests)
    or 2. verifies that outputs are as expected for given inputs (e.g. unit tests).
  • New and existing tests pass locally with my changes.

AndrewAnnex and others added 30 commits June 27, 2022 14:32
@AndrewAnnex
start of find and replace, may have renamed things too aggressively. …
45bca88 
…No clue if CI builds would work.
@AndrewAnnex
some fixes, the requirements files are a bit messy
99c1ac5
@AndrewAnnex
missed a comma
be38670
@AndrewAnnex
fixed arviz version
92ff107
@Japhiolite
change headers of test data to fit aesara
a4d2e75
@Japhiolite
Try to solve setuptools error in testing
4d93513
@Japhiolite
Revert "Try to solve setuptools error in testing"
e3e2d77 
This reverts commit 4d93513.
@Japhiolite
Merge branch 'master' into pr/706
8e87bfa
@Japhiolite
try to fix setuptools bug in test
295e385
@Japhiolite
Update setup.py
99b6016
@AndrewAnnex
Merge branch 'master' into dev_pymc4_aesara
2b14f35
@Japhiolite
Merge branch 'master' into dev_pymc4_aesara
e11cf3b
@Leguark
[WIP] Start chopping
fa362a7
@Leguark
[WIP] Moving files to the new structure
4d1fda5
@Leguark
[WIP] Moving test to the correspondent folder
c4f502f
@Leguark
[WIP] Setting up development framework
33610dd
@Leguark
Merge remote-tracking branch 'AndrewAnnex/dev_pymc4_aesara' into gemp…
e5a60b0 
…y_v3

# Conflicts:
#	test/input_data/save_model/test_save_model/test_save_model_surfaces.csv
@Leguark
[TEST] Set framework for new code
e314be9
@Leguark
[TEST] Remove the unnecessary aspects of the test
192c5d7
@Leguark
[WIP] Cleaning code and preparing
3ded77d
@Leguark
[WIP] Setting up first hybrid test
a6ab288
@Leguark
[WIP] Adding gempy engine result to gempy solution
eb878c1
@Leguark
[WIP] Adding gempy engine result to gempy solution
7d25d3f
@Leguark
[WIP] Filling more fields of solution
1ae33ec
@Leguark
[ENH/WIP] Fixing sorting surfaces with gempy3
4d559d6
@Leguark
[BUG/Upgrade] adapt pandas pd.set_option('display.precision', 2) func…
1862ea3 
…tion to new syntax
@Leguark
[CLN]
273e424
@Leguark
[BUG] Fixed pyvista colors
65b9c7a
@Leguark
[WIP] Getting meshes plotted
3efa033
@Leguark
[BUG] Seems to have fixed pyvista update
baedc9e
Japhiolite and others added 26 commits May 17, 2023 17:05
@Japhiolite
[WIP] remove inplace for pandas cat
7228591
@Japhiolite
[WIP] remove sklearn from optional req
3314aed
@Japhiolite
[WIP] cleanup optional requirements
427c9b0
@Japhiolite
[WIP] skip gempy3 to gempy2 tests for now
93e481b
@Japhiolite
[WIP] test actions env variable
2f28068
@Japhiolite
[WIP] adapt yml to skip gempy3 tests
6b28e4a
@Japhiolite
[WIP] correct path
48a6eef
@Japhiolite
Update pytest.yml
272bde3
@Japhiolite
exclude specific files as folder did not work
362eed2
@Japhiolite
Update test_performance.py
21dea32
Fix#801
ad1c34c
@Japhiolite
[WIP] change mapping surfaces to series
7868b7e
@Japhiolite
Update surfaces.py
cc3b233
@Japhiolite
[WIP] remove inplace features for pandas cats
2945ed3
@Japhiolite
Merge pull request #802 from cgre-aachen/gempy_v2023.1.0_dev_aj
32ba7d7 
Fix#801
@Japhiolite
[CLN] remove old commented mapping
d6abe3d
EditReadme
6b02b44
FixTypo
95bc0ce
FixTypoandAddLinks
1fbb7a8
@Japhiolite
Merge pull request #803 from cgre-aachen/gempy_v2023.1.0_readme
976e973 
Remove Version Warnings and Add Information about DEPs
@Japhiolite
[WIP] change mpl backend to agg for unittests
c2e0bb3
@Japhiolite
[WIP] specify pd version in setup.py
2e0b2cd
@Japhiolite
Merge pull request #799 from cgre-aachen/gempy_v2023.1.0-pandas2.0
28dcdc1 
[WIP] remove inplace for pandas cat
@Japhiolite
[WIP] testing conda test env
3f5044b
@Japhiolite
[WIP] remove wait
aeba5da
@Japhiolite
[WIP] freeze dependencies
f0fd684
@Japhiolite Japhiolite requested a review from Leguark June 20, 2023 08:42
@Leguark Leguark merged commit f0fd684 into main Jun 20, 2023
2 of 4 checks passed
@AndrewAnnex AndrewAnnex mentioned this pull request Jun 20, 2023
Closed
6 tasks
@Leguark Leguark deleted the gempy_v2023.1.0 branch June 25, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Leguark Leguark Awaiting requested review from Leguark

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Japhiolite @AlexanderJuestel @Leguark @AndrewAnnex