Skip to content

Commit 8445923

Browse files
authored
Merge branch 'main' into dependabot/nuget/dot-config/multi-b40ea38606
2 parents 7512731 + 25fc8ed commit 8445923

File tree

189 files changed

+1943
-46499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+1943
-46499
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "9.0.2",
6+
"version": "10.0.0-alpha011",
77
"commands": [
88
"paket"
99
],
1010
"rollForward": false
1111
},
1212
"fable": {
13-
"version": "4.25.0",
13+
"version": "5.0.0-alpha.17",
1414
"commands": [
1515
"fable"
1616
],

.fantomasignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
Build.fs
2-
Helpers.fs
3-
Util.fs
4-
51
# Ignore script files
62
*.fsx

.github/workflows/build-and-test.yml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v4
15+
1516
- uses: actions/setup-python@v5
1617
with:
1718
python-version: '3.10'
@@ -24,31 +25,22 @@ jobs:
2425
8.x
2526
9.x
2627
27-
- name: Setup dotnet tools
28-
run: dotnet tool restore
29-
30-
- name: Install src dependencies
31-
run: dotnet restore src
28+
- name: Install just
29+
uses: extractions/setup-just@v2
3230

33-
- name: Install test dependencies
34-
run: dotnet restore test
31+
- name: Restore dependencies
32+
run: just restore
3533

36-
- name: Install pytest runner
37-
run: pipx install pytest
38-
39-
- name: Install build dependencies
40-
run: dotnet restore Build.fsproj
34+
- name: Install Python dependencies
35+
run: |
36+
pipx install uv
37+
just install-python
4138
4239
#- name: Check formatting
43-
# run: dotnet fantomas . -r --check
40+
# run: just format-check
4441

4542
- name: Build
46-
run: dotnet run Build --configuration Release --no-restore
47-
48-
- name: Install dependencies
49-
run: |
50-
pipx install uv
51-
uv sync
43+
run: just build
5244

5345
- name: Test
54-
run: dotnet run Test
46+
run: just test

.github/workflows/publish.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,25 @@ jobs:
1313
uses: actions/checkout@v4
1414

1515
- name: Setup .NET Core
16-
uses: actions/setup-dotnet@v4
16+
uses: actions/setup-dotnet@v5
1717
with:
1818
dotnet-version: |
1919
6.x
2020
8.x
2121
9.x
22+
10.x
2223
23-
- name: Setup tools
24-
run: dotnet tool restore
25-
- name: Dotnet Pack
26-
run: dotnet pack -c Release -p:PackageVersion=${GITHUB_REF##*/v} -p:FileVersion=${GITHUB_REF##*/v} -p:InformationalVersion=${GITHUB_REF##*/v} src
24+
- name: Install just
25+
uses: extractions/setup-just@v2
2726

28-
- name: Push Nuget
27+
- name: Restore dependencies
28+
run: |
29+
dotnet tool restore
30+
dotnet restore src
31+
32+
- name: Pack NuGet
33+
run: just pack-version ${GITHUB_REF##*/v}
34+
35+
- name: Push NuGet
2936
run: dotnet nuget push src/bin/Release/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
3037
continue-on-error: false
31-

.nojekyll

Whitespace-only changes.

Build.fs

Lines changed: 0 additions & 72 deletions
This file was deleted.

Build.fsproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

Fable.Python.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Python", "src\Fable.P
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Python.Test", "test\Fable.Python.Test.fsproj", "{B449F60F-C422-40EE-A734-90A1E3084150}"
99
EndProject
10-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "Build.fsproj", "{492ED4DE-E609-469A-AAAF-8800AB86C224}"
11-
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Any CPU = Debug|Any CPU

Helpers.fs

Lines changed: 0 additions & 110 deletions
This file was deleted.

README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,33 @@ dependency management. To handle dependencies when adding Fable Python
9191
compatible NuGet packages, you should use
9292
[Femto](https://github.com/Zaid-Ajaj/Femto).
9393

94+
## Development
95+
96+
This project uses [just](https://github.com/casey/just) as a command runner.
97+
98+
```sh
99+
# Install just (macOS)
100+
> brew install just
101+
102+
# Show available commands
103+
> just
104+
105+
# Full setup (restore .NET and Python dependencies)
106+
> just setup
107+
108+
# Build F# to Python
109+
> just build
110+
111+
# Run all tests (native .NET and Python)
112+
> just test
113+
114+
# Format code
115+
> just format
116+
117+
# Create NuGet package
118+
> just pack
119+
```
120+
94121
## Contributing
95122

96123
This project is community driven. If the type binding you are looking

0 commit comments

Comments
 (0)