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.

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

V3.3.1 #1346

Merged
merged 2 commits into from
Nov 1, 2024
Merged

V3.3.1 #1346

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cm/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## V3.3.1
- allow "cm/cmx pull repo {URL}" along with "cm/cmx pull repo --url={URL}"
- CMX: added "automation_full_path" to -log

## V3.2.9
- fixed minor bug with JSON console output
- fixed minor bug with console in cmind.x function
Expand Down
2 changes: 1 addition & 1 deletion cm/cmind/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Written by Grigori Fursin

__version__ = "3.2.9"
__version__ = "3.3.1"

from cmind.core import access
from cmind.core import x
Expand Down
3 changes: 3 additions & 0 deletions cm/cmind/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,9 @@ def _x(self, i, control):
loaded_common_automation = True

# Finalize automation class initialization
if not self.logger == None:
self.log(f"x automation_full_path: {automation_full_path}", "info")

initialized_automation = loaded_automation_class(self, automation_full_path)
initialized_automation.meta = automation_meta
initialized_automation.full_path = automation_full_path
Expand Down
6 changes: 6 additions & 0 deletions cm/cmind/repo/automation/repo/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ def pull(self, i):
checkout_only = i.get('checkout_only', False)
skip_zip_parent_dir = i.get('skip_zip_parent_dir', False)

# Check alias is URL
if url == '' and (alias.startswith('https://') or alias.startswith('git@')):
url = alias
alias = ''

# Process URL and alias
if url == '':
if alias != '':
url = self.cmind.cfg['repo_url_prefix']
Expand Down
1 change: 1 addition & 0 deletions cm/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pyyaml
requests
setuptools
wheel
giturlparse
2 changes: 1 addition & 1 deletion cm/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run(self):
'install': custom_install
},

install_requires=['pyyaml', 'requests', 'setuptools', 'giturlparse'],
install_requires=['pyyaml', 'requests', 'setuptools', 'wheel', 'giturlparse'],

entry_points={"console_scripts": [
"cmind = cmind.cli:run",
Expand Down
Loading