Skip to content

Commit 8eca975

Browse files
committed
swapped names of cobra and krait
1 parent b1b6984 commit 8eca975

25 files changed

+755
-752
lines changed

CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1717

1818
## [0.3.x]
1919

20+
- Swapped names of `cobra` and `krait` projects.
21+
2022
- Renamed `zthread` to `ztp` to emphasize the use of zeromq + threads + python
2123

2224
- Building `py` and `pyjs` via `make` doesn't require `cython` to be installed.
@@ -28,7 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2830

2931
- Changed the main `CMakeLists.txt` file to enable single-project build options.
3032

31-
- Merged `mambo` features into `mamba` and `krait`. `mambo` is removed as a separate subproject.
33+
- Merged `mambo` features into `mamba` and `cobra`. `mambo` is removed as a separate subproject.
3234

3335
- Added `mambo` variant of `mamba` which uses a new way of building relocatable python3 externals. It includes a tweaked version of the `mamba` single-header c-based python3 library, and makes use of a slightly modified version of the `source/scripts/buildpy.py` script which was [developed externally](https://github.com/shakfu/buildpy). So far, shared, static, and framework builds are possible via: `make mambo-shared`, `make mambo-static` and `make mambo-framework` respectively.
3436

@@ -85,7 +87,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
8587

8688
- Discovered builtin way for max to find the external using an included but undocumented function. This is by way of the `class_getpath` function. This is demonstrated (partially) in the `py.c` method `t_symbol* py_locate_path_to_external(t_py* x)`
8789

88-
- Added the `krait` project, which pushes the single-header implementation into cpp territory with a cpp class `PythonInterpreter` implementing and encapsulating all of the functionality. This is final extension of the idea of modular python3 interpreter which can be easily nested into any Max external object.
90+
- Added the `cobra` project, which pushes the single-header implementation into cpp territory with a cpp class `PythonInterpreter` implementing and encapsulating all of the functionality. This is final extension of the idea of modular python3 interpreter which can be easily nested into any Max external object.
8991

9092
- Added the `mamba` project: a single header python3 library for max externals which provides the `t_py` max type providings max-friendly python3 interpreter methods. The idea is that an object from this type be instanciated and nested inside any another external.
9193

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ list(APPEND BUILD_TARGETS py pyjs)
7979
endif()
8080

8181
if(BUILD_PYTHON3_EXPERIMENTAL_EXTERNALS)
82-
list(APPEND BUILD_TARGETS cobra krait mamba mxpy)
82+
list(APPEND BUILD_TARGETS krait cobra mamba mxpy)
8383
endif()
8484

8585
if(BUILD_POCKETPY_EXTERNALS)

Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ beeware-ext: clean-externals
329329
.PHONY: py py-static py-shared py-framework py-framework-pkg \
330330
pyjs pyjs-static pyjs-shared pyjs-framework pyjs-framework-pkg \
331331
mamba mamba-static mamba-shared mamba-framework mamba-framework-pkg \
332-
krait krait-static krait-shared krait-framework krait-framework-pkg \
333-
cobra jmx ztp zpy zedit shell
332+
cobra cobra-static cobra-shared cobra-framework cobra-framework-pkg \
333+
krait jmx ztp zpy zedit shell
334334

335335

336336
py: clean-cmake-cache clean-externals
@@ -378,22 +378,22 @@ mamba-framework: clean-cmake-cache clean-externals
378378
mamba-framework-pkg: clean-cmake-cache clean-externals
379379
$(call xcode-target,mamba,framework-pkg)
380380

381-
krait: clean-cmake-cache clean-externals
382-
$(call xcode-target,krait,local)
381+
cobra: clean-cmake-cache clean-externals
382+
$(call xcode-target,cobra,local)
383383

384-
krait-static: clean-cmake-cache clean-externals
385-
$(call xcode-target,krait,static-ext)
384+
cobra-static: clean-cmake-cache clean-externals
385+
$(call xcode-target,cobra,static-ext)
386386

387-
krait-shared: clean-cmake-cache clean-externals
388-
$(call xcode-target,krait,shared-ext)
387+
cobra-shared: clean-cmake-cache clean-externals
388+
$(call xcode-target,cobra,shared-ext)
389389

390-
krait-framework: clean-cmake-cache clean-externals
391-
$(call xcode-target,krait,framework-ext)
390+
cobra-framework: clean-cmake-cache clean-externals
391+
$(call xcode-target,cobra,framework-ext)
392392

393-
krait-framework-pkg: clean-cmake-cache clean-externals
394-
$(call xcode-target,krait,framework-pkg)
393+
cobra-framework-pkg: clean-cmake-cache clean-externals
394+
$(call xcode-target,cobra,framework-pkg)
395395

396-
cobra: clean-cmake-cache clean-externals
396+
krait: clean-cmake-cache clean-externals
397397
$(call xcode-target,$@,local)
398398

399399
pktpy: clean-cmake-cache clean-externals

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ These two externals have many [build options](https://github.com/shakfu/py-js/tr
3030
name | sdk | lang | description
3131
:--------- | :--------- | :----: | :---------------------------------------------------
3232
[mamba] | max-sdk | c | single-header c library to nest a python3 interpreter in any external
33-
[krait] | max-sdk | c++ | single-header c++ library to nest a python3 interpreter in any external
34-
[cobra] | max-sdk | c | python3 external providing deferred and clocked function execution
33+
[cobra] | max-sdk | c++ | single-header c++ library to nest a python3 interpreter in any external
34+
[krait] | max-sdk | c | python3 external providing deferred and clocked function execution
3535
[mxpy] | max-sdk | c | a translation of [pdpython](https://github.com/shakfu/pdpython) into Max
3636
[zedit] | max-sdk | c | a web-based python editor using [codemirror](https://codemirror.net) and the [mongoose](https://github.com/cesanta/mongoose) embedded webserver.
3737
[pymx] | min-api | c++ | concise python3 external, modern, using [pybind11](https://github.com/pybind/pybind11) and [min-api](https://github.com/Cycling74/min-api)
@@ -250,9 +250,9 @@ Thanks to Greg Neagle for zeroing in on the relocatability problem and sharing h
250250
[mxpy]: https://github.com/shakfu/py-js/tree/main/source/projects/mxpy
251251
[pymx]: https://github.com/shakfu/min.pymx
252252
[zpy]: https://github.com/shakfu/py-js/tree/main/source/projects/zpy
253-
[cobra]: https://github.com/shakfu/py-js/tree/main/source/projects/cobra
254-
[mamba]: https://github.com/shakfu/py-js/tree/main/source/projects/mamba
255253
[krait]: https://github.com/shakfu/py-js/tree/main/source/projects/krait
254+
[mamba]: https://github.com/shakfu/py-js/tree/main/source/projects/mamba
255+
[cobra]: https://github.com/shakfu/py-js/tree/main/source/projects/cobra
256256
[pktpy]: https://github.com/shakfu/py-js/tree/main/source/projects/pktpy
257257
[pktpy2]: https://github.com/shakfu/py-js/tree/main/source/projects/pktpy2
258258
[zedit]: https://github.com/shakfu/py-js/tree/main/source/projects/zedit

TODO.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# TODO
22

3-
- [ ] archive `zpy`, which is not so useful now, given `ztp`
4-
5-
- [ ] `krait` and `cobra` to swap names
3+
- [ ] Archive `zpy`, which is not so useful now, given `ztp`
64

75
- [ ] Alternatively, use [buildpy](https://github.com/shakfu/buildpy) and [xcodegen](https://github.com/yonaskolb/XcodeGen) to build relocatable
86
python builds, generate xccongfig and xcode projects
97

108
- [ ] Try pyodide in the browser to communicate with Max via the external /
119
mongoose websockets.
1210

11+
- [x] Swap names of `cobra` and `krait` externals.
12+
1313
- [x] rename `zthread` to `ztp` for 'zeromq-threaded-python', enable additional build variants.
14+

0 commit comments

Comments
 (0)