Skip to content

Update project dependencies to support newer Python versions #12

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

Open
ianakotey wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Update project dependencies to support newer Python versions #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8097c1e
Update .gitignore to include Visual Studio Code settings and extensions
ianakotey Jul 25, 2025
0d0a4b2
Add __init__.py to tests/config to make TestConfigParser tests discov…
ianakotey Jul 25, 2025
e485f78
Update tabulate to 0.9.0 in setup.py
ianakotey Jul 25, 2025
37ff7ad
Update canvasapi version to 3.3.0 in setup.py
ianakotey Jul 25, 2025
b3c58ff
Update cmd2 version to 0.9.13 in setup.py
ianakotey Jul 25, 2025
070341e
Update cmd2 version to 0.9.23 in setup.py
ianakotey Jul 25, 2025
7bbc52a
Update cmd2 version to 0.10.0 in setup.py
ianakotey Jul 25, 2025
6102e8e
Hide Enum representation from user by including __str__ and __repr__ …
ianakotey Jul 25, 2025
cb65502
Update cmd2 to 2.3.1, updating code to fit API changes.
ianakotey Jul 25, 2025
aec4b6d
Refactor verbosity handling and update cmd2 version in setup.py
ianakotey Jul 25, 2025
81755a1
chore: Add coverage files to .gitignore
ianakotey Aug 13, 2025
21fd253
fix: Downgrade cmd2 version to 2.5.6 in setup.py
ianakotey Aug 13, 2025
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
15 changes: 15 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,18 @@ venv/
build/
clanvas.egg-info/
dist/

.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
!*.code-workspace

# Built Visual Studio Code Extensions
*.vsix

# test coverage
.coverage
.coverage.*
30 changes: 22 additions & 8 deletions clanvas/clanvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import cmd2
import colorama
from canvasapi import Canvas
from cmd2 import Cmd
from cmd2 import Cmd, Settable

from .completion import apply_completers
from .config import InvalidClanvasConfigurationException, parse_clanvas_config_file
Expand All @@ -26,14 +26,28 @@ class Clanvas(cmd2.Cmd):
CLANVAS_CATEGORY = 'Clanvas'

def __init__(self, base_url, access_token, *args, **kwargs):
super(Clanvas, self).__init__(*args, **kwargs)

# The `cmd2` library will attempt to inspect the object
# for attributes. Since one attribute is `prompt` defined
# as a property that checks for `self.canvas`, we need to
# ensure that `self.canvas` is initialized to avoid
# an AttributeError during initialization.
self.canvas = None

# Explicitly set allow_cli_args to False to prevent cmd2 from parsing CLI args
# Since we already handle CLI args in the main function
super(Clanvas, self).__init__(*args, allow_cli_args=False, **kwargs)

self.default_to_shell = True
self.allow_cli_args = False

self.settable.update({'prompt_format': 'prompt format string'})
self.settable.update({'verbosity': 'default command verbosity (NORMAL/VERBOSE/DEBUG)'})
self.settable.pop('prompt')
self.add_settable(Settable('prompt_format',
val_type=str,
description = 'prompt format string', settable_object=self))
self.add_settable(Settable('verbosity',
val_type=Verbosity.__getitem__,
description='default command verbosity (NORMAL/VERBOSE/DEBUG)',
choices=(Verbosity.__members__.values()),
settable_object=self))

self.url = base_url
self.host = urlparse(base_url).netloc
Expand Down Expand Up @@ -77,13 +91,13 @@ def list_assignments_cached(self, course_id):
return sorted(course.get_assignments(), key=lambda t: t.created_at_date)

def get_verbosity(self) -> Verbosity:
return Verbosity[self.verbosity]
return self.verbosity

prompt_format = (Fore.LIGHTGREEN_EX + '{login_id}@{host}' + Style.RESET_ALL + ':'
+ Fore.LIGHTYELLOW_EX + '{pwc}' + Style.RESET_ALL + ':' + Fore.LIGHTBLUE_EX
+ '{pwd} ' + Style.RESET_ALL + '$ ').replace('\x1b', "\\x1b")

verbosity = 'NORMAL'
verbosity = Verbosity.NORMAL

canvas_path = expanduser('~/canvas')

Expand Down
16 changes: 16 additions & 0 deletions clanvas/outputter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ class Verbosity(Enum):
VERBOSE = 2
DEBUG = 3

def __str__(self):
return self.name

def __repr__(self):
return str(self)

def __eq__(self, value):
if isinstance(value, str):
# Convert strings to Verbosity enum members before comparison
return super().__eq__(Verbosity.__getitem__(value))

return super().__eq__(value)

def __hash__(self):
return super().__hash__()


class Outputter:
def __init__(self, printfn, verbosityfn):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
author='Mark Lalor',
author_email='[email protected]',
install_requires=[
'canvasapi==0.12.0', 'cmd2==0.9.12', 'tabulate>=0.8.3', 'tree-format>=0.1.2',
'canvasapi==3.3.0', 'cmd2==2.5.6', 'tabulate>=0.9.0', 'tree-format>=0.1.2',
'html2text', 'colorama', 'pytz', 'tzlocal'
],
extras_require={
Expand Down
Empty file added tests/config/__init__.py
View file
Open in desktop
Empty file.