Do a merge commit from main into develop #319
Merged
Conversation
This file contains 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
Merge develop into main, for release (2.0.0) Many changes - Added pyproject.toml to aid with pip installation. - Engineering -- Formatting with Black -- Linting with Pylint -- Dependency management and packaging with Rye - Added tests to cover more mepo commands - Added new command update-state to permanently convert mepo1 style state to mepo2 - Converted mepo to a Python project -- Added src/mepo/__init__.py -- Renamed mepo.d -> src/mepo -- Renamed mepo.d/utest -> tests -- Renamed doc --> docs -- A mepo config file is now called a mepo registry -- More code reorganization - Helper script mepo, used for development, moved to the bin directory. Not removed yet. - Added README for docs/make_md_docs.py script - State: pickle format (mepo1 style) to json format (mepo2 style) -- If mepo1 style state is detected, print warning and suggest running mepo update-state
* Add brew tap installation instructions * Add update-state to readme
* Added ability to print version info (#309) * Add brew tap installation instructions (#302) * Add brew tap installation instructions * Add update-state to readme * Added ability to print version info * Updated Changelog * Testing mepo version against the last release version number * Removing lock files We really shouldn't need to version control lock files. Reusing already existing virtualenv Generating production lockfile: /home/pchakrab/workspace/code/mepo/develop/requirements.lock Generating dev lockfile: /home/pchakrab/workspace/code/mepo/develop/requirements-dev.lock Installing dependencies Found existing installation: mepo 2.0.0 Uninstalling mepo-2.0.0: Successfully uninstalled mepo-2.0.0 Looking in indexes: https://pypi.org/simple/ Obtaining file:///. (from -r /home/pchakrab/tmp/tmpatm5q2yh (line 1)) Installing build dependencies: started Installing build dependencies: finished with status 'done' Checking if build backend supports build_editable: started Checking if build backend supports build_editable: finished with status 'done' Getting requirements to build editable: started Getting requirements to build editable: finished with status 'done' Installing backend dependencies: started Installing backend dependencies: finished with status 'done' Preparing editable metadata (pyproject.toml): started Preparing editable metadata (pyproject.toml): finished with status 'done' Building wheels for collected packages: mepo Building editable for mepo (pyproject.toml): started Building editable for mepo (pyproject.toml): finished with status 'done' Created wheel for mepo: filename=mepo-2.0.0-py3-none-any.whl size=11085 sha256=758e0b5ae11be1d887f2598e6c04fc09648e00a736ffbe8ae47fbad802e2978f Stored in directory: /home/pchakrab/tmp/pip-ephem-wheel-cache-5f1wnqzn/wheels/97/54/f5/d849319cdfa096e074df352654ee2e7c919da8951f090690c6 Successfully built mepo Installing collected packages: mepo Successfully installed mepo-2.0.0 Done! will generate them from * Removing lock files Merging the changes from main brought in the lock files again * Using rye for Python and package management * Minor cleanup of workflows --------- Co-authored-by: Matt Thompson <[email protected]> * Add spack install instructions (#310) * Update README (#315) * Store complete remote url in state file (#316) * Added pytest as a dev dependency to pyproject.toml Now we can run tests via 'rye test' * Store full remote path of every repo in state file * Moved logic to apply style to local path to a separate function * Remote URL is not relative anymore * Added pytests for Registry and MepoComponent classes * Running 'rye test' to run all tests * Generate default __eq__() method in MepoComponent to (rich) compare two instances of this class * Updated test_component for the case when remote is an https url instead of ssh * Switched to https protocol * bug fix * Remote was of a different repo. Fixed now. * Removed MepoState dependence of git.py The state file (state.json) stores the relative local path to each repo. However, during reading of the state, MepoState converts it to an absolute path, and every instantiation of GitRepository uses an absolute local path. So we don't need to call get_root_dir() from GitRepository * Added explicit init of MepoComponent * update-state writes compelete remote url * Removed unnecessary, and wrong, check for local path * Bumped the minor version number * Moved pytest from being a dependency to a dev-dependency. Fixed test that checks for version * Completion working now --------- Co-authored-by: Matt Thompson <[email protected]>
* Added ability to print version info (#309) * Add brew tap installation instructions (#302) * Add brew tap installation instructions * Add update-state to readme * Added ability to print version info * Updated Changelog * Testing mepo version against the last release version number * Removing lock files We really shouldn't need to version control lock files. Reusing already existing virtualenv Generating production lockfile: /home/pchakrab/workspace/code/mepo/develop/requirements.lock Generating dev lockfile: /home/pchakrab/workspace/code/mepo/develop/requirements-dev.lock Installing dependencies Found existing installation: mepo 2.0.0 Uninstalling mepo-2.0.0: Successfully uninstalled mepo-2.0.0 Looking in indexes: https://pypi.org/simple/ Obtaining file:///. (from -r /home/pchakrab/tmp/tmpatm5q2yh (line 1)) Installing build dependencies: started Installing build dependencies: finished with status 'done' Checking if build backend supports build_editable: started Checking if build backend supports build_editable: finished with status 'done' Getting requirements to build editable: started Getting requirements to build editable: finished with status 'done' Installing backend dependencies: started Installing backend dependencies: finished with status 'done' Preparing editable metadata (pyproject.toml): started Preparing editable metadata (pyproject.toml): finished with status 'done' Building wheels for collected packages: mepo Building editable for mepo (pyproject.toml): started Building editable for mepo (pyproject.toml): finished with status 'done' Created wheel for mepo: filename=mepo-2.0.0-py3-none-any.whl size=11085 sha256=758e0b5ae11be1d887f2598e6c04fc09648e00a736ffbe8ae47fbad802e2978f Stored in directory: /home/pchakrab/tmp/pip-ephem-wheel-cache-5f1wnqzn/wheels/97/54/f5/d849319cdfa096e074df352654ee2e7c919da8951f090690c6 Successfully built mepo Installing collected packages: mepo Successfully installed mepo-2.0.0 Done! will generate them from * Removing lock files Merging the changes from main brought in the lock files again * Using rye for Python and package management * Minor cleanup of workflows --------- Co-authored-by: Matt Thompson <[email protected]> * Add spack install instructions (#310) * Update README (#315) * Store complete remote url in state file (#316) * Added pytest as a dev dependency to pyproject.toml Now we can run tests via 'rye test' * Store full remote path of every repo in state file * Moved logic to apply style to local path to a separate function * Remote URL is not relative anymore * Added pytests for Registry and MepoComponent classes * Running 'rye test' to run all tests * Generate default __eq__() method in MepoComponent to (rich) compare two instances of this class * Updated test_component for the case when remote is an https url instead of ssh * Switched to https protocol * bug fix * Remote was of a different repo. Fixed now. * Removed MepoState dependence of git.py The state file (state.json) stores the relative local path to each repo. However, during reading of the state, MepoState converts it to an absolute path, and every instantiation of GitRepository uses an absolute local path. So we don't need to call get_root_dir() from GitRepository * Added explicit init of MepoComponent * update-state writes compelete remote url * Removed unnecessary, and wrong, check for local path * Bumped the minor version number * Moved pytest from being a dependency to a dev-dependency. Fixed test that checks for version * Completion working now --------- Co-authored-by: Matt Thompson <[email protected]>
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.
Github is acting weirdly. So this is a by hand-merge commit of main into develop. Aka: