Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship copyright and license files with split crates #297

Merged
merged 1 commit into from
Jan 15, 2024

Conversation

michel-slm
Copy link
Contributor

Now that procfs and procfs-core are individual crates located in subdirectories of the repo, make sure the copyright and license texts are symlinked so they get packaged when the crates are published.

Also fix typoo in COPYRIGHT.txt

michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ cargo package --allow-dirty --no-verify
   Packaging procfs-core v0.16.0 (/home/michel/src/github/eminence/procfs/procfs-core)
    Packaged 32 files, 329.5KiB (78.3KiB compressed)

michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-core-0.16.0.crate | grep COPYRIGHT
procfs-core-0.16.0/COPYRIGHT.txt

michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-core-0.16.0.crate | grep LICENSE
procfs-core-0.16.0/LICENSE-APACHE
procfs-core-0.16.0/LICENSE-MIT
michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ cargo package --allow-dirty --no-verify
   Packaging procfs v0.16.0 (/home/michel/src/github/eminence/procfs/procfs)
    Updating crates.io index
    Packaged 48 files, 266.1KiB (71.7KiB compressed)

michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0 took 2s
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-0.16.0.crate | grep COPYRIGHT
procfs-0.16.0/COPYRIGHT.txt

michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-0.16.0.crate | grep LICENSE
procfs-0.16.0/LICENSE-APACHE
procfs-0.16.0/LICENSE-MIT

Now that `procfs` and `procfs-core` are individual crates located in
subdirectories of the repo, make sure the copyright and license texts
are symlinked so they get packaged when the crates are published.

Also fix typoo in COPYRIGHT.txt

```
michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ cargo package --allow-dirty --no-verify
   Packaging procfs-core v0.16.0 (/home/michel/src/github/eminence/procfs/procfs-core)
    Packaged 32 files, 329.5KiB (78.3KiB compressed)

michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-core-0.16.0.crate | grep COPYRIGHT
procfs-core-0.16.0/COPYRIGHT.txt

michel in procfs/procfs-core on  add-license [!?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-core-0.16.0.crate | grep LICENSE
procfs-core-0.16.0/LICENSE-APACHE
procfs-core-0.16.0/LICENSE-MIT
```

```
michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ cargo package --allow-dirty --no-verify
   Packaging procfs v0.16.0 (/home/michel/src/github/eminence/procfs/procfs)
    Updating crates.io index
    Packaged 48 files, 266.1KiB (71.7KiB compressed)

michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0 took 2s
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-0.16.0.crate | grep COPYRIGHT
procfs-0.16.0/COPYRIGHT.txt

michel in procfs/procfs on  add-license [?] via 🐍 v3.11.6 (.venv311) via 🦀 v1.73.0
⬢ [fedora-toolbox:38] ❯ bsdtar tf ../target/package/procfs-0.16.0.crate | grep LICENSE
procfs-0.16.0/LICENSE-APACHE
procfs-0.16.0/LICENSE-MIT
```

Signed-off-by: Michel Lind <salimma@fedoraproject.org>
@eminence
Copy link
Owner

I appreciate the fix, thank you

@eminence eminence merged commit 7145ef0 into eminence:master Jan 15, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants