Repository navigation
Skpkg migration - #71
Merged
Merged
Conversation
fix: add windows support
add: flags for linking libobjcryst
correct prefix
add: auto release with sha
remove travis ci and local conda recipe
style: add pre-commit
rename doc to docs objcryst link name for linux
Bump fallback_version
…eqs to requirements/
…s to point to the rst file
Merge windows branch into skpkg-migration
chore: standardize release tags
skpkg: minor updates to docs, README, etc
ci: remove redundant runs on different python versions, unify env init
doc: skip Python package installation when building docs
# Conflicts: # src/diffpy/srreal/EmptyStructureAdapter.cpp # src/diffpy/srreal/NoMetaStructureAdapter.cpp # src/diffpy/srreal/NoMetaStructureAdapter.hpp # src/diffpy/srreal/NoSymmetryStructureAdapter.cpp # src/diffpy/srreal/NoSymmetryStructureAdapter.hpp # src/diffpy/srreal/PQEvaluator.cpp # src/diffpy/srreal/PairQuantity.cpp # src/diffpy/srreal/StructureAdapter.hpp # src/tests/TestNoMetaStructureAdapter.hpp # src/tests/test_custompqconfig.hpp
chore: resolve merge conflicts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.