Skip to content

Commit 858a530

Browse files
sbdchdsbdchd
authored
internal: refactor crate dir structure (#429)
Getting the repo ready for merging of squawk v2. Part 1/?
1 parent 45118d4 commit 858a530

File tree

292 files changed

+70
-47
lines changed

Some content is hidden

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

292 files changed

+70
-47
lines changed

‎.github/workflows/python.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
target: ${{ matrix.platform.target }}
5252
maturin-version: v1.7.1
53-
working-directory: cli
53+
working-directory: crates/cli
5454
args: --release --out dist ${{ matrix.platform.maturin-options }}
5555
manylinux: ${{ matrix.platform.manylinux }}
5656
sccache: "true"
@@ -59,7 +59,7 @@ jobs:
5959
uses: actions/upload-artifact@v4
6060
with:
6161
name: wheels-linux-${{ matrix.platform.target }}
62-
path: cli/dist
62+
path: crates/cli/dist
6363
if-no-files-found: error
6464

6565
windows:
@@ -79,14 +79,14 @@ jobs:
7979
uses: PyO3/maturin-action@v1
8080
with:
8181
target: ${{ matrix.platform.target }}
82-
working-directory: cli
82+
working-directory: crates/cli
8383
args: --release --out dist
8484
sccache: "true"
8585
- name: Upload wheels
8686
uses: actions/upload-artifact@v4
8787
with:
8888
name: wheels-windows-${{ matrix.platform.target }}
89-
path: cli/dist
89+
path: crates/cli/dist
9090
if-no-files-found: error
9191

9292
macos:
@@ -106,14 +106,14 @@ jobs:
106106
uses: PyO3/maturin-action@v1
107107
with:
108108
target: ${{ matrix.platform.target }}
109-
working-directory: cli
109+
working-directory: crates/cli
110110
args: --release --out dist
111111
sccache: "true"
112112
- name: Upload wheels
113113
uses: actions/upload-artifact@v4
114114
with:
115115
name: wheels-macos-${{ matrix.platform.target }}
116-
path: cli/dist
116+
path: crates/cli/dist
117117
if-no-files-found: error
118118

119119
sdist:
@@ -126,13 +126,13 @@ jobs:
126126
uses: PyO3/maturin-action@v1
127127
with:
128128
command: sdist
129-
working-directory: cli
129+
working-directory: crates/cli
130130
args: --out dist
131131
- name: Upload sdist
132132
uses: actions/upload-artifact@v4
133133
with:
134134
name: wheels-sdist
135-
path: cli/dist
135+
path: crates/cli/dist
136136
if-no-files-found: error
137137

138138
release:

‎Cargo.toml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
11
[workspace]
2-
members = [
3-
"cli",
4-
"parser",
5-
"linter",
6-
"github"
7-
]
2+
members = ["crates/*"]
83

4+
[workspace.dependencies]
5+
# third party
6+
serde_json = "1.0"
7+
tempfile = "3.2.0"
8+
serde = { version = "1.0", features = ["derive"] }
9+
structopt = "0.3"
10+
console = "0.11.3"
11+
atty = "0.2"
12+
base64 = "0.12.2"
13+
simplelog = "0.12.0"
14+
log = "0.4.8"
15+
toml = "0.5.9"
16+
glob = "0.3.1"
17+
insta = "0.16.0"
18+
jsonwebtoken = "8.1.1"
19+
reqwest = { version = "0.9.18", features = ["default-tls-vendored"]}
20+
serde_plain = "1.0"
21+
lazy_static = "1.4.0"
22+
serde_repr = "0.1"
23+
libpg_query-sys = { git = "https://github.com/chdsbd/libpg_query-sys.git", rev = "ac223c7b197459d657d166449ccf99883f23bbcb" }
924

25+
# local
26+
squawk-parser = { version = "0.0.0", path = "./crates/parser" }
27+
squawk-linter = { version = "0.0.0", path = "./crates/linter" }
28+
squawk-github = { version = "0.0.0", path = "./crates/github" }
29+
30+
[profile.dev.package]
31+
insta.opt-level = 3

cli/Cargo.toml renamed to crates/cli/Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ license = "GPL-3.0"
77
description = "Linter for Postgresql focused on database migrations."
88
repository = "https://github.com/sbdchd/squawk"
99
documentation = "https://github.com/sbdchd/squawk/blob/master/README.md"
10-
readme = "../README.md"
10+
readme = "../../README.md"
1111
keywords = ["postgres", "postgresql", "linter"]
1212
categories = ["command-line-utilities", "development-tools"]
1313

1414
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1515

1616
[dependencies]
17-
serde_json = "1.0"
18-
tempfile = "3.2.0"
19-
serde = { version = "1.0", features = ["derive"] }
20-
structopt = "0.3"
21-
console = "0.11.3"
22-
atty = "0.2"
23-
base64 = "0.12.2"
24-
simplelog = "0.12.0"
25-
log = "0.4.8"
26-
squawk-parser = { version = "0.0.0", path = "../parser" }
27-
squawk-linter = { version = "0.0.0", path = "../linter" }
28-
squawk-github = { version = "0.0.0", path = "../github" }
29-
toml = "0.5.9"
30-
glob = "0.3.1"
17+
serde_json.workspace = true
18+
tempfile.workspace = true
19+
serde.workspace = true
20+
structopt.workspace = true
21+
console.workspace = true
22+
atty.workspace = true
23+
base64.workspace = true
24+
simplelog.workspace = true
25+
log.workspace = true
26+
squawk-parser.workspace = true
27+
squawk-linter.workspace = true
28+
squawk-github.workspace = true
29+
toml.workspace = true
30+
glob.workspace = true
3131

3232
[dev-dependencies]
33-
insta = "0.16.0"
33+
insta.workspace = true

cli/pyproject.toml renamed to crates/cli/pyproject.toml

File renamed without changes.

cli/src/config.rs renamed to crates/cli/src/config.rs

File renamed without changes.

cli/src/file_finding.rs renamed to crates/cli/src/file_finding.rs

File renamed without changes.

cli/src/main.rs renamed to crates/cli/src/main.rs

File renamed without changes.

cli/src/reporter.rs renamed to crates/cli/src/reporter.rs

File renamed without changes.

cli/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap renamed to crates/cli/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap

File renamed without changes.

cli/src/snapshots/squawk__config__test_config__load_cfg_full.snap renamed to crates/cli/src/snapshots/squawk__config__test_config__load_cfg_full.snap

File renamed without changes.

0 commit comments

Comments
 (0)