circup 2.1.1__tar.gz → 2.1.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {circup-2.1.1 → circup-2.1.2}/.github/workflows/build.yml +1 -1
- {circup-2.1.1/circup.egg-info → circup-2.1.2}/PKG-INFO +1 -1
- {circup-2.1.1 → circup-2.1.2}/circup/shared.py +1 -1
- {circup-2.1.1 → circup-2.1.2/circup.egg-info}/PKG-INFO +1 -1
- {circup-2.1.1 → circup-2.1.2}/tests/mock_device/boot_out.txt +1 -1
- {circup-2.1.1 → circup-2.1.2}/tests/test_circup.py +18 -6
- {circup-2.1.1 → circup-2.1.2}/.github/ISSUE_TEMPLATE.md +0 -0
- {circup-2.1.1 → circup-2.1.2}/.github/PULL_REQUEST_TEMPLATE.md +0 -0
- {circup-2.1.1 → circup-2.1.2}/.github/workflows/release.yml +0 -0
- {circup-2.1.1 → circup-2.1.2}/.gitignore +0 -0
- {circup-2.1.1 → circup-2.1.2}/.isort.cfg +0 -0
- {circup-2.1.1 → circup-2.1.2}/.pre-commit-config.yaml +0 -0
- {circup-2.1.1 → circup-2.1.2}/.pylintrc +0 -0
- {circup-2.1.1 → circup-2.1.2}/CODE_OF_CONDUCT.rst +0 -0
- {circup-2.1.1 → circup-2.1.2}/CODE_OF_CONDUCT.rst.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/CONTRIBUTING.rst +0 -0
- {circup-2.1.1 → circup-2.1.2}/CONTRIBUTING.rst.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/LICENSE +0 -0
- {circup-2.1.1 → circup-2.1.2}/LICENSES/CC-BY-4.0.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/LICENSES/MIT.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/LICENSES/Unlicense.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/README.rst +0 -0
- {circup-2.1.1 → circup-2.1.2}/README.rst.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/__init__.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/backends.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/bundle.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/command_utils.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/commands.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/config/bundle_config.json +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/config/bundle_config.json.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/logging.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/module.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/wwshell/README.rst +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/wwshell/README.rst.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/wwshell/__init__.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup/wwshell/commands.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup.egg-info/SOURCES.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup.egg-info/dependency_links.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup.egg-info/entry_points.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup.egg-info/requires.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/circup.egg-info/top_level.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/_static/favicon.ico +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/_static/favicon.ico.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/conf.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/index.rst +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/index.rst.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/logo.png +0 -0
- {circup-2.1.1 → circup-2.1.2}/docs/logo.png.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/optional_requirements.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/optional_requirements.txt.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/pyproject.toml +0 -0
- {circup-2.1.1 → circup-2.1.2}/readthedocs.yml +0 -0
- {circup-2.1.1 → circup-2.1.2}/requirements.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/requirements.txt.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/setup.cfg +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/__init__.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/bad_module/__init__.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/bad_module/my_module.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/bad_python.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/bundle.json +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/bundle.json.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/device.json +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/device.json.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/dir_module/__init__.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/dir_module/my_module.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/import_styles.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/local_module.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/local_module_cp7.mpy +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/local_module_cp7.mpy.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mock_device/boot_out.txt.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mock_device/lib/adafruit_waveform/.gitkeep +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mount_exists.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mount_exists.txt.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mount_missing.txt +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/mount_missing.txt.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/remote_module.py +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_bundle_config.json +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_bundle_config.json.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_bundle_config_local.json +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_bundle_config_local.json.license +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_module.mpy +0 -0
- {circup-2.1.1 → circup-2.1.2}/tests/test_module.mpy.license +0 -0
|
@@ -16,7 +16,7 @@ jobs:
|
|
|
16
16
|
run: echo "$GITHUB_CONTEXT"
|
|
17
17
|
- name: Translate Repo Name For Build Tools filename_prefix
|
|
18
18
|
id: repo-name
|
|
19
|
-
run: echo
|
|
19
|
+
run: echo "repo-name=circup" >> $GITHUB_OUTPUT
|
|
20
20
|
- name: Set up Python 3.11
|
|
21
21
|
uses: actions/setup-python@v1
|
|
22
22
|
with:
|
|
@@ -21,7 +21,7 @@ BAD_FILE_FORMAT = "Invalid"
|
|
|
21
21
|
DATA_DIR = appdirs.user_data_dir(appname="circup", appauthor="adafruit")
|
|
22
22
|
|
|
23
23
|
#: Module formats list (and the other form used in github files)
|
|
24
|
-
PLATFORMS = {"py": "py", "
|
|
24
|
+
PLATFORMS = {"py": "py", "9mpy": "9.x-mpy"}
|
|
25
25
|
|
|
26
26
|
#: Timeout for requests calls like get()
|
|
27
27
|
REQUESTS_TIMEOUT = 30
|
|
@@ -94,10 +94,10 @@ def test_Bundle_lib_dir():
|
|
|
94
94
|
"adafruit/adafruit-circuitpython-bundle-py/"
|
|
95
95
|
"adafruit-circuitpython-bundle-py-TESTTAG/lib"
|
|
96
96
|
)
|
|
97
|
-
assert bundle.lib_dir("
|
|
97
|
+
assert bundle.lib_dir("9mpy") == (
|
|
98
98
|
circup.shared.DATA_DIR + "/"
|
|
99
|
-
"adafruit/adafruit-circuitpython-bundle-
|
|
100
|
-
"adafruit-circuitpython-bundle-
|
|
99
|
+
"adafruit/adafruit-circuitpython-bundle-9mpy/"
|
|
100
|
+
"adafruit-circuitpython-bundle-9.x-mpy-TESTTAG/lib"
|
|
101
101
|
)
|
|
102
102
|
|
|
103
103
|
|
|
@@ -378,6 +378,16 @@ def test_Module_mpy_mismatch():
|
|
|
378
378
|
assert m2.outofdate is False
|
|
379
379
|
assert m3.mpy_mismatch is True
|
|
380
380
|
assert m3.outofdate is True
|
|
381
|
+
with mock.patch(
|
|
382
|
+
"circup.backends.DiskBackend.get_circuitpython_version",
|
|
383
|
+
return_value=("9.0.0", ""),
|
|
384
|
+
):
|
|
385
|
+
assert m1.mpy_mismatch is False
|
|
386
|
+
assert m1.outofdate is False
|
|
387
|
+
assert m2.mpy_mismatch is True
|
|
388
|
+
assert m2.outofdate is True
|
|
389
|
+
assert m3.mpy_mismatch is True
|
|
390
|
+
assert m3.outofdate is True
|
|
381
391
|
|
|
382
392
|
|
|
383
393
|
def test_Module_major_update_bad_versions():
|
|
@@ -419,14 +429,16 @@ def test_Module_row():
|
|
|
419
429
|
repo = "https://github.com/adafruit/SomeLibrary.git"
|
|
420
430
|
with mock.patch("circup.os.path.isfile", return_value=True), mock.patch(
|
|
421
431
|
"circup.backends.DiskBackend.get_circuitpython_version",
|
|
422
|
-
return_value=("
|
|
432
|
+
return_value=("9.0.0", ""),
|
|
423
433
|
), mock.patch("circup.logger.warning") as mock_logger:
|
|
424
434
|
backend = DiskBackend("mock_device", mock_logger)
|
|
425
435
|
m = Module(name, backend, repo, "1.2.3", None, False, bundle, (None, None))
|
|
426
436
|
assert m.row == ("module", "1.2.3", "unknown", "Major Version")
|
|
427
437
|
m = Module(name, backend, repo, "1.2.3", "1.3.4", False, bundle, (None, None))
|
|
428
438
|
assert m.row == ("module", "1.2.3", "1.3.4", "Minor Version")
|
|
429
|
-
m = Module(
|
|
439
|
+
m = Module(
|
|
440
|
+
name, backend, repo, "1.2.3", "1.2.3", True, bundle, ("8.0.0", "9.0.0")
|
|
441
|
+
)
|
|
430
442
|
assert m.row == ("module", "1.2.3", "1.2.3", "MPY Format")
|
|
431
443
|
|
|
432
444
|
|
|
@@ -806,7 +818,7 @@ def test_get_circuitpython_version():
|
|
|
806
818
|
with mock.patch("circup.logger.warning") as mock_logger:
|
|
807
819
|
backend = DiskBackend("tests/mock_device", mock_logger)
|
|
808
820
|
assert backend.get_circuitpython_version() == (
|
|
809
|
-
"
|
|
821
|
+
"9.0.0",
|
|
810
822
|
"this_is_a_board",
|
|
811
823
|
)
|
|
812
824
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|