Skip to content

Commit

Permalink
Merge branch 'master' into srz-zumix-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix authored Oct 23, 2024
2 parents 4e6b137 + e7d6920 commit b12b662
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 17 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
groups:
actions-minor:
update-types:
- minor
- patch

- package-ecosystem: pip
directory: /
schedule:
interval: weekly
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ jobs:
strategy:
matrix:
python-version:
- "3.6"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
Expand Down
3 changes: 2 additions & 1 deletion samples/command/src/elixir/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@

ELIXIR:=elixir
MIX:=mix
IGNORE_ERROR:=-

local:
${ELIXIR} sample.exs
(cd sample && ${MIX} test)

wandbox:
make -C . local --no-print-directory ELIXIR="wandbox-elixir run" MIX="wandbox-mix run"
${IGNORE_ERROR} make -C . local --no-print-directory ELIXIR="wandbox-elixir run" MIX="wandbox-mix run"
3 changes: 2 additions & 1 deletion samples/command/src/erlang/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
# Makefile

EALANG:=erlc
IGNORE_ERROR:=-

local:
${EALANG} prog.erl
#erl -noshell -s sample main -s init stop

wandbox:
make -C . local --no-print-directory EALANG="wandbox-erlc run"
${IGNORE_ERROR} make -C . local --no-print-directory EALANG="wandbox-erlc run"
2 changes: 1 addition & 1 deletion samples/command/src/go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

GOBUILD=GO111MODULE=off go run
# NOTE: head version is not stable
WANDBOX_CLI_OPTIONS:=--no-head
WANDBOX_CLI_OPTIONS:=-c=go-1.16.3

local:
${GOBUILD} sample.go
Expand Down
3 changes: 2 additions & 1 deletion samples/command/src/ocaml/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
OCAMLOPT:=ocamlopt
# NOTE: head version is not stable
# WANDBOX_CLI_OPTIONS:=--no-head
IGNORE_ERROR:=-

local:
${OCAMLOPT} sample.ml

wandbox:
make -C . local --no-print-directory OCAMLOPT="wandbox-ocamlopt --no-ocaml-core ${WANDBOX_CLI_OPTIONS} run"
${IGNORE_ERROR} make -C . local --no-print-directory OCAMLOPT="wandbox-ocamlopt --no-ocaml-core ${WANDBOX_CLI_OPTIONS} run"
4 changes: 2 additions & 2 deletions samples/command/src/zig/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const std = @import("std");
const test1 = @import("test1.zig");
const test2 = @import("./test2.zig").print;
const test3 = @import("sub/test3.zig").print;
const test4 = @import("sub/test4.txt");
const test5 = @import("sub/test5").print; const root_print = @import("root").print_all;
const test4 = @import("sub/test4.zig");
const test5 = @import("sub/test5/test5.zig").print; const root_print = @import("root").print_all;

pub fn main() void {
std.debug.print("Hello, {s}!\n", .{"World"});
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
author_ = [x for x in re.split(r"[ =']", line) if x][1]
f.close()

test_deps = ['importlib-metadata<2,>=0.12', 'tox', 'tox-pyenv', 'pytest']
test_deps = ['importlib-metadata<2,>=0.12', 'tox<4', 'tox-pyenv', 'pytest']

setup(
name = "wandbox-api"
Expand Down
8 changes: 4 additions & 4 deletions tests/test_wandbox_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ def wandbox_run(self, opt):

def test_wildcard(self):
try:
opt = [ '--dryrun', '--compiler=clang-11.*[!c]' ]
opt = [ '--dryrun', '--compiler=zig-0.9.*' ]
opt.extend(run_cxx_options)
self.wandbox_run(opt)
except SystemExit as e:
output = self.stdoout()
eprint(output)
self.assertEqual(e.code, 0)
self.assertTrue('clang-11.1.0' in output)
self.assertTrue('zig-0.9.1' in output)
else:
self.fail('SystemExit exception expected')

def test_version(self):
opt = [ '-l=C++', '-c=clang-11.1.0', 'version' ]
opt = [ '-l=Zig', '-c=zig-0.9.1', 'version' ]
self.wandbox_run(opt)
output = self.stdoout()
eprint(output)
self.assertEqual('11.1.0', output.strip())
self.assertEqual('0.9.1', output.strip())

class test_wandbox_cxx(wandbox_test_base):

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[tox]
envlist =
py36
py37
py38
py39
py310
py311
py312
py313
flake8
skipsdist=True
skip_missing_interpreters=True
Expand Down

0 comments on commit b12b662

Please sign in to comment.