Skip to content

Develop into master for the new release (0.0.4) #31

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
Merged
merged 274 commits into from
Feb 3, 2022
Merged

Develop into master for the new release (0.0.4) #31

merged 274 commits into from
Feb 3, 2022

Conversation

@rozyczko
Copy link
Member

@rozyczko rozyczko commented Feb 3, 2022

No description provided.

wardsimon and others added 30 commits October 19, 2020 14:35
@wardsimon
Fixup naming conventions
88c7914
@wardsimon
Recursive path gen update
c55b9c2
@wardsimon
Add debuging
ee88c96 
REmove plot debugging
@wardsimon
Add a Jupyter notebook
dae6b99
@wardsimon
Create devcontainer.json
5bf362c
@wardsimon
Create Dockerfile
6f24128
@wardsimon
Update devcontainer.json
24b2f5d
@wardsimon
Update devcontainer.json
e2dee45
@wardsimon
Update devcontainer.json
5058690
@wardsimon
Create Base.Dockerfile
e9a558f
@wardsimon
Create common-debian.sh
218a219
@wardsimon
Create python-debian.sh
210fce9
@wardsimon
Create node-debian.sh
b1767ad
@wardsimon
Change the way phases are managed
d3a1479
@wardsimon
Modify formation of Pattern
3081014
@AndrewSazonov
Remove monty
0dec13a
@wardsimon
Update example notebook
0581108
@AndrewSazonov
Rename Cryspy -> CrysPy
2f6c5e2
@wardsimon
Change from cryspy -> CrysPy
2e46f22
@wardsimon
Introduce a fitting example
7425f85
@AndrewSazonov
Initial implementation of GSAS-II
04c3107
@AndrewSazonov
Load GSASII from github (macOS only)
02bc71c
@AndrewSazonov
Import GSASII
06d9e57
@AndrewSazonov
Use CFML so_macos branch
9187c58
@AndrewSazonov
fix branch name
7e7d26a
@AndrewSazonov
Update import GSASII
6a30094
@AndrewSazonov
fix platform call
9072c1e
@AndrewSazonov
Set matplotlib version
846b2e1
@AndrewSazonov
try matplotlib 3.2.2
b3a2c59
@AndrewSazonov
Delete poetry.lock
e63a6f6
wardsimon and others added 26 commits October 11, 2021 14:26
@wardsimon
Add patch to autobuild (fix pypi arguments)
792089a
@wardsimon
Create pypi_publish.yml
966ec09
@rozyczko
Modified mp_mc branch with pathos multiprocessing commented out
c8ba665
@rozyczko
Merge branch 'develop' into multiphase
b7ef004
@rozyczko
Added convencience methods for single phase profiles
be26f02
@rozyczko
Redefine additional_data['components'] with scaled values
2644fae
@rozyczko
typo in toml
c7a6fc5
@wardsimon
Implement multiphase with CFML
d28e7d2
@wardsimon
More CFML multiphase changes
5ff10ac 
Now phases are in the correct order and no memloc errors
@wardsimon
Fix memory issues again
717a759
@wardsimon
Fix spacegroup errors for multiphase
eefe821
@AndrewSazonov
Add support for the multiple HKL sets
9d58010
@rozyczko
x_array is unnecessary for cryspy - hkl has already been calculated in
ce2c833 
the profile run
@wardsimon
Fix for getting HKL's
97a8a31
@wardsimon
Use easyCrystallography
9dfd6b8
@rozyczko
Added a multiphase fitting example
50b8779
@rozyczko
Merge branch 'multiphase' of https://github.com/easyScience/easyDiffr…
41220e6 
…actionLib into multiphase
@rozyczko
Merge remote-tracking branch 'origin/easyCrystallography' into releas…
978535e 
…e-0.8.3
@rozyczko
fix a "typo".
4b0f77a
@rozyczko
fixed method signatures.
70a478e
@rozyczko
Merge branch 'develop' into release-0.8.3
654560d
@rozyczko
Update requirements
ee44d4a
@rozyczko
Test pre-release branch of easyCore
da41bb9
@rozyczko
Updated copyright year
b6ae64e
@rozyczko
Try to use the release version of easyCore
38b5984
@rozyczko
Merge branch 'master' into develop
8b55434
github-actions[bot]
github-actions bot requested changes Feb 3, 2022
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request does not contain a valid label. Please add one of the following labels: ['chore', 'fix', 'bugfix', 'bug', 'enhancement', 'feature', 'dependencies', 'documentation']

@rozyczko rozyczko added the [scope] enhancement Adds/improves features (major.MINOR.patch) label Feb 3, 2022
@rozyczko rozyczko merged commit 882585f into master Feb 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

No one assigned

Labels

[scope] enhancement Adds/improves features (major.MINOR.patch)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rozyczko @wardsimon @AndrewSazonov