Commit graph

230 commits

Author SHA1 Message Date
ff6d40dca9
Fix json output when a bundle does not use submodules
Some bundles, such as circuitpython-fonts, don't use submodules to
contain their individual libraries.

Change build_bundle_json so that it works correctly if multiple
libraries come from the same submodule.

With this change, the generated metadata for circuitpython-fonts
contains an entry for every font, not just for one font.
2023-12-19 13:19:04 -06:00
4f50d277da
enable standard zip ("deflate") compression
This saves ~50% on the main bundle and will save ~85% on the fonts bundle
2023-12-19 11:23:53 -06:00
7dadcc70aa
ensure tags are present
this should fix the message during CI
```
.../setuptools_scm/git.py:163: UserWarning: "/home/runner/work/circuitpython-build-tools/circuitpython-build-tools" is shallow and may cause errors
  warnings.warn(f'"{wd.path}" is shallow and may cause errors')
```

This may have been introduced when upgrading action/checkout recently,
or it might be pre-existing.
2023-12-17 08:59:45 -06:00
6a4079769f
string vs number 2023-12-17 08:12:48 -06:00
e896099f09
bump minimum python version to 3.10
.. this is what is used during the build of the adafruit bundle right now.
2023-12-17 08:10:45 -06:00
87ba4b679b
we now recommend github actions as the CI system of choice 2023-12-17 08:04:05 -06:00
b49cd8413a
Merge pull request #105 from 2bndy5/replace-pkg_resources
addresses #103
2023-12-17 07:59:47 -06:00
Brendan
1e64df5969 remove travis CI specific code 2023-12-16 20:02:27 -08:00
Brendan
4d4844451c upgrade github actions to latest major 2023-12-15 21:32:16 -08:00
Brendan
7cd8379d01 addresses #103 2023-12-15 21:32:16 -08:00
Dan Halbert
bcb5427418
Merge pull request #104 from jepler/require-tomli-setup.py
require tomli at install time
2023-12-14 14:52:31 -05:00
951b47c132
require tomli at install time 2023-12-14 10:58:14 -06:00
Dan Halbert
9f02e3a1c9
Merge pull request #102 from adafruit/correct-naming
Change terminology
2023-12-05 10:08:59 -05:00
Dan Halbert
f9a8aa3b1a
Change remaining blacklist to blocklist 2023-12-05 09:55:11 -05:00
0032a80387
Change terminology 2023-12-05 08:02:34 -06:00
Dan Halbert
988ed9803f
Merge pull request #101 from adafruit/include-binary-files-in-package
Get package name from pyproject.toml, allow arbitrary files in packages
2023-12-02 23:19:58 -05:00
b51d905d9d
blacklist should let this pass CI 2023-12-02 15:23:07 -06:00
373b256441
typo 2023-12-02 15:23:07 -06:00
ca779868d8
pyproject is the name of the file 2023-11-30 10:34:45 -06:00
0c58704d65
Restore behavior of shipping 0-byte py files as .py, not .mpy
(it's smaller on disk)
2023-11-30 09:11:58 -06:00
d8719e4d04
Get package name from settings.toml, allow arbitrary files in packages
This is more dependable, and when we know the package name we can
glob inside it to get all files such as bin or ttf files.

This will allow e.g., 5x8.bin & ov5640_autofocus.bin within
bundles.

the behavior of bundlefly and circup when encountering .bin files
needs to be checked.

Tested by building modified pycamera bundle and the autofocus.bin file
appears in the generated zip files:
```
pycamera-py-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
pycamera-8.x-mpy-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
pycamera-9.x-mpy-ec67bde/lib/adafruit_pycamera/ov5640_autofocus.bin 4077 4096
```

There's at least one library in the bundle that has incorrect metadata
and that leads to an error:
    https://github.com/adafruit/Adafruit_CircuitPython_Colorsys/pull/29
2023-11-30 09:06:27 -06:00
Scott Shawcroft
34c259dfe9
Merge pull request #100 from FoamyGuy/include_pyproject_toml
include pyproject.toml file in the bundle if it exists.
2023-10-31 12:16:29 -07:00
foamyguy
86b60039f2 include pyproject.toml file in the bundle if it exists. 2023-10-30 16:32:50 -05:00
Dan Halbert
20b08fbd76
Merge pull request #99 from adafruit/tannewt-patch-8
Add 9.x bundles
2023-10-27 15:16:20 -04:00
Dan Halbert
653f4e9e50
Use 8.2.0 mpy-cross instead of 8.0.0
Its pathname will match the 9.0.0 name.
2023-10-27 14:58:29 -04:00
Scott Shawcroft
af26b78ea9
Update mpy-cross locations 2023-10-27 10:11:11 -07:00
Scott Shawcroft
4d5881b8c3
Add 9.x bundles 2023-10-27 09:34:40 -07:00
Scott Shawcroft
efd487a89a
Merge pull request #98 from adafruit/tannewt-patch-8
Stop building bundles for 7.x
2023-10-03 09:41:52 -07:00
Scott Shawcroft
39377e3e2b
Stop building bundles for 7.x 2023-10-02 12:07:30 -07:00
Alec Delaney
bc2d2a0c7d
Merge pull request #97 from tekktrik/dev/bundle-build-ignore
Allow bundles to be skipped
2023-07-27 21:14:11 -04:00
Tekktrik
123186b725 Use click.Choice 2023-07-27 20:58:13 -04:00
Tekktrik
fa235526a8 Allow bundles to be skipped 2023-07-10 21:50:06 -04:00
Scott Shawcroft
312d8d090e
Merge pull request #96 from FoamyGuy/remote_name_arg
--remote_name argument
2023-06-28 09:04:04 -07:00
foamyguy
0b44929f49 remote name argument 2023-06-27 19:12:21 -05:00
Dan Halbert
565482692b
Merge pull request #95 from adafruit/dhalbert-patch-1
Update to use mpy-cross-8.0.0 instead of 8.0.0-alpha.1
2023-02-16 14:54:41 -05:00
Dan Halbert
d10761a18f
Update to use mpy-cross-8.0.0 instead of 8.0.0-alpha.1 2023-02-16 14:23:35 -05:00
Dan Halbert
0a2ac582ee
Merge pull request #93 from Neradoc/dont-normalize-names
Fix listing dependencies in json
2022-08-19 07:36:35 -04:00
Neradoc
ad4908adbf add spidev to skipped pypi modules 2022-08-18 16:17:02 +02:00
Neradoc
795e3d2ff9 change normalize_dist_name to get back the bundle libraries 2022-08-18 15:55:22 +02:00
Alec Delaney
687af8c22b
Merge pull request #92 from tekktrik/dev/change-version-string
Update version string
2022-08-16 12:44:29 -04:00
Alec Delaney
c3cf652f31
Change both version strings
Doesn't require a patch to be done simultaneously
2022-08-16 12:42:51 -04:00
Alec Delaney
26375aaa16 Update version string 2022-08-15 20:47:21 -04:00
Melissa LeBlanc-Williams
97895d21a3
Merge pull request #90 from adafruit/ignore-more-package-names
build_bundles: Ignore more packages that exist only on pypi
2022-07-18 13:02:43 -07:00
38931db45e
Don't ignore busdevice
This is a weird one since some devices have it in core now, and others don't.

This happened in part because I copypasted the list currently in pipkin instead of tweaking the existing list, which was initially added with this module in the list: b9957133a9
2022-07-18 14:41:15 -05:00
9fb6ffb1ea
build_bundles: Ignore more packages that exist only on pypi
…and sort the existing list and use 'normalized' names

The implementation of normalize_dist_name is taken from pipkin.
2022-07-18 12:55:47 -05:00
foamyguy
3552198336
Merge pull request #88 from Neradoc/fix-single-file-libraries-mpy
Fix the single file libraries being copied as source.
2022-06-18 15:34:20 -05:00
Neradoc
a0e40b58da Fix the single file libraries being copied as source.
The code generates a temp file with the library version.
By mistake that was ALWAYS copied back to the mpy file for single file libraries.
The temporary files for the package libraries were also not deleted.

For windows compatibility, the temporary file must be copied (and therefore erased) outside of the with block. In this PR we only keep the temporary file open the time to write to it, and then do the rest.
2022-06-17 23:47:04 +02:00
Scott Shawcroft
2b255aa47d
Merge pull request #87 from Neradoc/add-cp8-to-bundles
Generate Circuitpython 8.x bundle
2022-06-14 09:23:52 -07:00
Neradoc
d98fb9082c Generate Circuitpython 8.X bundle 2022-06-14 16:26:04 +02:00
Dan Halbert
8c66f80024
Merge pull request #86 from Neradoc/patch-1
Bump the mpy-cross version to 7.3.0
2022-06-14 09:37:12 -04:00