Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 45 additions & 6 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python: [cp37, cp38, cp39, cp310, cp311, cp312]
python: [cp37, cp38, cp39, cp310, cp311, cp312, cp313, cp314]

steps:
- uses: actions/checkout@v4
Expand All @@ -35,15 +35,15 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python: [cp310, cp311, cp312]
python: [cp310, cp311, cp312, cp313, cp314]

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
id: python
with:
python-version: "3.10 - 3.12"
python-version: "3.10 - 3.14"
update-environment: false

- name: NPM steps
Expand All @@ -67,14 +67,52 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.python }}-mac
name: wheels-${{ matrix.python }}-mac-arm64
path: ./wheelhouse/*.whl
build_mac_intel_wheels:
name: Build wheels on macos/x86_64
runs-on: macos-15-intel
strategy:
matrix:
python: [cp310, cp311, cp312, cp313, cp314]

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
id: python
with:
python-version: "3.10 - 3.14"
update-environment: false

- name: NPM steps
run: |
npm install
npm run build

- name: Fix path
run: |
export PATH=$(python3 -m site --user-base)/bin:$PATH

- name: Build wheels
uses: pypa/cibuildwheel@v2.21.1
env:
CIBW_BUILD: ${{ matrix.python }}-macosx*
CIBW_ARCHS_MACOS: arm64
CIBW_ENVIRONMENT_MACOS : >
MACOSX_DEPLOYMENT_TARGET=11.0
with:
package-dir: ${{github.workspace}}
- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.python }}-mac-x86_64
path: ./wheelhouse/*.whl
build_manylinux_wheels:
name: Build wheels on manylinux
runs-on: ubuntu-latest
strategy:
matrix:
python: [cp37, cp38, cp39, cp310, cp311, cp312, pp39, pp310]
python: [cp37, cp38, cp39, cp310, cp311, cp312, cp313, cp314, pp39, pp310]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -102,7 +140,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [cp37, cp38, cp39, cp310, cp311, cp312]
python: [cp37, cp38, cp39, cp310, cp311, cp312, cp313, cp314]

steps:
- uses: actions/checkout@v4
Expand All @@ -128,6 +166,7 @@ jobs:
needs:
- build_windows_wheels
- build_mac_wheels
- build_mac_intel_wheels
- build_manylinux_wheels
- build_musllinux_wheels
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
LinuxPython:
strategy:
matrix:
python_version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]

runs-on: ${{inputs.vmImage}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
MacPython:
strategy:
matrix:
python_version: ["3.10", "3.11", "3.12"]
python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

runs-on: ${{inputs.vmImage}}

Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/pr-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,10 @@ jobs:
needs: [linting, cpp-format]
uses: ./.github/workflows/mac.yml
with:
vmImage: macos-latest
vmImage: macos-latest

mac-intel-job:
needs: [linting, cpp-format]
uses: ./.github/workflows/mac.yml
with:
vmImage: macos-15-intel
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
WindowsPython:
strategy:
matrix:
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]

runs-on: ${{inputs.vmImage}}

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.1.2
52 changes: 22 additions & 30 deletions bundle.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
let browserify = require("browserify");
let tsify = require("tsify");
let minify = require("minify-stream");
let derequire = require("browserify-derequire");
let fs = require("fs");
let exorcist = require("exorcist");
const esbuild = require("esbuild");
const { mkdir } = require("node:fs/promises");
const { join } = require('node:path');
const { readFileSync } = require("node:fs");
const { join } = require("node:path");

async function createDist() {
const dirCreation = await mkdir("dist")
console.log(dirCreation)
return dirCreation
}

if (!fs.existsSync("dist")){
createDist().catch(console.error)
}
async function build() {
await mkdir("dist", { recursive: true });
const version = readFileSync("VERSION", "utf8").trim();

let stream = fs.createWriteStream(join("dist", "scenepic.min.js"))
let mapFile = join("dist", "scenepic.min.js.map")
await esbuild.build({
entryPoints: ["tssrc/ScenePic.ts"],
bundle: true,
platform: "browser",
format: "iife",
outfile: join("dist", "scenepic.min.js"),
sourcemap: true,
minify: true,
banner: { js: `// ${version}\n` }
});

version = fs.readFileSync("VERSION")
stream.write("// " + version + "\n")
console.info("Built dist/scenepic.min.js");
}

let b = browserify()
.add([
"tssrc/ScenePic.ts",
])
.plugin(tsify)
.plugin(derequire)
.bundle()
.pipe(minify())
.pipe(exorcist(mapFile))
.pipe(stream)
build().catch(err => {
console.error(err);
process.exit(1);
});
33 changes: 24 additions & 9 deletions debug.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
let browserify = require("browserify")
let tsify = require("tsify")
let fs = require("fs")
const esbuild = require("esbuild");
const { mkdir } = require("node:fs/promises");
const { readFileSync } = require("node:fs");
const { join } = require("node:path");

stream = fs.createWriteStream("dist/scenepic.js")
async function build() {
await mkdir("dist", { recursive: true });
const version = readFileSync("VERSION", "utf8").trim();

let b = browserify()
.add('./tssrc/ScenePic.ts')
.plugin(tsify)
.bundle()
.pipe(stream)
await esbuild.build({
entryPoints: ["tssrc/ScenePic.ts"],
bundle: true,
platform: "browser",
format: "iife",
outfile: join("dist", "scenepic.js"),
sourcemap: true,
banner: { js: `// ${version}\n` }
});

console.info("Built dist/scenepic.js");
}

build().catch(err => {
console.error(err);
process.exit(1);
});
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = "ScenePic Team"

# The full version, including alpha/beta/rc tags
release = "1.1.1"
release = "1.1.2"


# -- General configuration ---------------------------------------------------
Expand Down
Loading