Commit graph

52 commits

Author SHA1 Message Date
0032a80387
Change terminology 2023-12-05 08:02:34 -06: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
foamyguy
86b60039f2 include pyproject.toml file in the bundle if it exists. 2023-10-30 16:32:50 -05:00
Scott Shawcroft
af26b78ea9
Update mpy-cross locations 2023-10-27 10:11:11 -07: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
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
2bndy5
a55a92367e self reviewed 2022-01-25 17:19:03 -08:00
2bndy5
bac3e8056f fix url for win x64 pre-built mpy-cross 2022-01-25 14:57:42 -08:00
2bndy5
2d53879c1a solution for #75 2022-01-21 14:29:44 -08:00
James Carr
eadbc29632
Add 'if not quiet' to the print statements 2021-05-30 15:45:33 +01:00
James Carr
385cbc607d
Add author info 2021-05-30 12:42:37 +01:00
James Carr
98b12389a8
Replace tab with spaces 2021-05-30 11:27:09 +01:00
James Carr
f69bc7b660
Add basic exception handling around the S3 request 2021-05-30 11:24:43 +01:00
James Carr
39b1fe192f
Add Linux/x86_64 to mpy-cross S3 check 2021-05-30 00:28:56 +01:00
James Carr
f4532c667c
Add macos support to S3 mpy-cross 2021-05-29 20:08:03 +01:00
James Carr
4c8cf86ebb
Pull mpy-cross from AWS S3 instead of building. (Closes #55)
Fall back to building if fetching fails.
2021-05-29 20:07:11 +01:00
Melissa LeBlanc-Williams
ffa8fe9324 Add library versions to JSON 2021-03-24 16:17:53 -07:00
Melissa LeBlanc-Williams
e457d835c0 Fix some packages were incorrectly detected 2021-03-23 15:43:29 -07:00
Melissa LeBlanc-Williams
85a47fc9c1 Added JSON generator for bundle 2021-03-23 11:53:31 -07:00
Neradoc
ddbd38f9a3 fix requirements for single file modules (fixes identifying single file modules) 2021-03-05 06:33:57 +01:00
Jeff Epler
d34e5226e7 library: Include requirements.txt metadata
It is hoped that this data will be useful to circup, enabling it to find
dependency information without phoning out to github.
2021-02-09 11:58:33 -06:00
sommersoft
283d8286bd properly truncate mpy filenames 2019-10-15 17:28:38 -05:00
sommersoft
b803b26f4a allow for multiple entries for the 'package_folder_prefix" argument 2019-09-24 21:54:02 -05:00
sommersoft
83ecd9525a use 'pathlib' vs 'os.walk' to gather files 2019-09-24 18:40:09 -05:00
sommersoft
519c62f3aa allow subfolders with 'examples' in the name, without truncating the path 2019-08-18 08:09:23 -05:00
sommersoft
8175c6c9a0 retain full subfolder structure in packages 2019-05-31 18:49:59 -05:00
sommersoft
7f8af9417d de-confuse 'package_folder_prefix' parameter naming 2019-05-14 20:29:52 -05:00
sommersoft
50ddabd2cc change 'package_folder_prefix' to a pos arg; grab examples subfolders 2019-05-11 09:32:21 -05:00
sommersoft
55c69b7b66 Revert "Revert "Include mpy-cross '__init__.py' In Packages; Restructure Package Bundling""
This reverts commit cd1a858a01.
2019-05-07 18:12:43 -05:00
Kattni
cd1a858a01
Revert "Include mpy-cross '__init__.py' In Packages; Restructure Package Bundling" 2019-05-07 15:04:16 -04:00
sommersoft
f803ba57a3 build.py->library: refactor file selection, so it includes subfolders 2019-05-06 10:44:22 -05:00
sommersoft
c38f93dcc4 restructure package file bundling; uses folder name prefix string 2019-05-02 13:15:32 -05:00
sommersoft
d8c18da0b6 remove mpy-cross exclusion for '__init__.py' in packaged modules 2019-05-02 12:09:15 -05:00
sommersoft
5256b1b1a9 include 'font5x8.bin' in examples for adafruit_framebuf 2019-02-04 22:29:46 -06:00
Scott Shawcroft
a65c0e9402
Fix the build by initing submodules under tools. 2018-10-16 16:49:43 -07:00
sommersoft
d4044dc39e added examples to each bundle; example bundle build. see bundle issue #3. 2018-10-11 16:10:03 -05:00
Dan Halbert
739d5be0f2 allow packages with one source file 2018-06-04 17:01:46 -04:00
Scott Shawcroft
fe27c65e2a Ignore docs directory and allow packages to drop __init__.py
Python 3.3 made __init__.py optional by adding "namespace packages"
and MicroPython supports them.
2018-01-31 11:31:11 -08:00
Scott Shawcroft
b95dadd177 Fix common case. 2017-12-26 13:33:19 -08:00
Dan Halbert
4f264c7c56
Merge pull request #5 from tannewt/fix_no_releases
Determine version even when no tags exist in the repo.
2017-12-26 15:39:54 -05:00
Scott Shawcroft
5ebe5d4173 Determine version even when no tags exist in the repo. 2017-12-26 12:30:41 -08:00
Scott Shawcroft
477a7f7b55 Raise an error when multiple top-level py files exist.
We used to attempt to create a package for the files but this will
change the import behavior only when bundled. Instead, the error
prompts the library author to fix it by combining the files or
creating a package.
2017-12-26 11:45:30 -08:00
Scott Shawcroft
f4c4e16c8d Factor out version replacement so its shared between individual
files and files in a package.

This fixes the bytes-like error that happens when trying to build
packages.
2017-12-21 11:41:26 -08:00
Scott Shawcroft
1f7cc3e854 Add support for replacing placeholder version string with git tag
based versions that are semver compatible. If a prerelease
identifier is already present we'll bump ahead by adding `.plus.`
and the number of subsequent commits. If its not, we'll bump the
patch digit and call it `alpha.0` and add the remaining `.plus.` bit.

This also changes the file names of the mpy zips to include "-mpy-"
which should help space out two potentially confusing version strings
(that of circuitpython and that of the library.)
2017-12-20 11:52:10 -08:00
Dan Halbert
073de8bdb6 include only relative library pathname in .mpy file 2017-12-18 15:08:10 -08:00