Skip to content

Commit 4a1fd1f

Browse files
pombredannepombredanne
authored
Merge pull request #74 from aboutcode-org/prep-release
Prep release
2 parents 41884fe + 1fd30a0 commit 4a1fd1f

327 files changed

Lines changed: 26213 additions & 10078 deletions

File tree

Some content is hidden

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

‎.github/workflows/run-unit-tests.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Run unit tests
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
branches:
8+
- main
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
run-unit-tests:
15+
runs-on: ubuntu-22.04
16+
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
with:
21+
persist-credentials: false # do not keep the token around
22+
23+
- name: Set up Python
24+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
25+
with:
26+
python-version: "3.12"
27+
28+
- name: Install dotnet and sys deps
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get install -y dotnet-sdk-6.0
32+
33+
- name: Install dependencies
34+
run: make dev
35+
36+
- name: Build the tool
37+
run: ./build.sh
38+
39+
- name: Create releases
40+
run: ./release.sh
41+
42+
- name: Upload builds
43+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
44+
with:
45+
name: nuget-inspectors
46+
path: release/*.tar.gz
47+
48+
- name: Run tests
49+
run: ./venv/bin/pytest -n3

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,4 @@ tcl
7474
.ipynb_checkpoints/
7575
/.ruff_cache/
7676
.env
77+
/release/

‎CHANGELOG.rst‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
Changelog
22
=========
33

4+
v0.10.0
5+
--------
6+
7+
This is a medium release with various fixes, improvements and updates
8+
9+
* Drop older version of Ubuntu
10+
* Improve README
11+
* Update skeletton
12+
* Update test results
13+
* Add support for Central Package Management (CPM)
14+
Thanks to Wolfgang Klenk @wkl3nk and MarcelBochtler @MarcelBochtler and @ msz-bd
15+
https://github.com/aboutcode-org/nuget-inspector/pull/72
16+
* Update dependencies
17+
Thanks to Georg Eckert @cz-dev-ge
18+
19+
420
v0.9.12
521
--------
622

@@ -116,10 +132,10 @@ This is a major feature update release with these updates and API breaking chang
116132

117133
* Remove nested "packages". Instead report only the "dependencies", nested as
118134
needed. Many processors return a flat list of dependencies. This is towards
119-
https://github.com/nexB/nuget-inspector/issues/24
135+
https://github.com/aboutcode-org/nuget-inspector/issues/24
120136

121137
* Resolve packages removing duplicates to fix
122-
https://github.com/nexB/nuget-inspector/issues/23
138+
https://github.com/aboutcode-org/nuget-inspector/issues/23
123139

124140

125141
v0.9.1

‎Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22

3-
FROM ubuntu:jammy as base-image
3+
FROM ubuntu:22.04 as base-image
44

55
ENV LANG=en_US.UTF-8
66
ENV LANGUAGE=en_US:en
@@ -19,7 +19,8 @@ RUN apt-get update \
1919
libssl3 \
2020
libstdc++6 \
2121
libunwind8 \
22-
zlib1g
22+
zlib1g \
23+
dotnet-sdk-6.0
2324

2425
ENV NI_ROOT=/opt/nuget-inspector
2526
ENV NI_HOME=$NI_ROOT/bin
@@ -31,9 +32,9 @@ RUN mkdir -p $NI_DOTNET_HOME \
3132
&& curl --location https://aka.ms/dotnet/6.0/dotnet-sdk-linux-x64.tar.gz \
3233
| tar -C $NI_DOTNET_HOME -xz
3334

34-
ARG NI_VERSION=0.9.12
35+
ARG NI_VERSION=0.10.0
3536
RUN mkdir -p $NI_HOME \
36-
&& curl -L https://github.com/nexB/nuget-inspector/releases/download/v${NI_VERSION}/nuget-inspector-v${NI_VERSION}-linux-x64.tar.gz \
37+
&& curl -L https://github.com/aboutcode-org/nuget-inspector/releases/download/v${NI_VERSION}/nuget-inspector-v${NI_VERSION}-linux-x64.tar.gz \
3738
| tar --strip-components=1 -C $NI_HOME -xz
3839

3940
ENTRYPOINT ["/opt/nuget-inspector/bin/nuget-inspector"]

‎Dockerfile.ubuntu18‎

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

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#
2-
# Copyright (c) nexB Inc. and others. All rights reserved.
3-
# ScanCode is a trademark of nexB Inc.
2+
# Copyright (c) AboutCode, nexB Inc. and others. All rights reserved.
43
# SPDX-License-Identifier: Apache-2.0
54
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
65
# See https://github.com/aboutcode-org/skeleton for support or download.
7-
# See https://aboutcode.org for more information about nexB OSS projects.
6+
# See https://aboutcode.org for more information about OSS projects.
87
#
98

109
# Python version can be specified with `$ PYTHON_EXE=python3.x make conf`

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# SPDX-License-Identifier: Apache-2.0 AND MIT
77
#
8-
# Visit https://aboutcode.org and https://github.com/nexB/nuget-inspector for
8+
# Visit https://aboutcode.org and https://github.com/aboutcode-org/nuget-inspector for
99
# support and download.
1010
# ScanCode is a trademark of nexB Inc.
1111
#

‎README.rst‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Usage
3232

3333
- Install the dotnet SDK 6.x for your platform from Microsoft
3434
https://learn.microsoft.com/en-us/dotnet/core/install/
35+
36+
- On debian and Ubuntu::
37+
38+
sudo apt-get install dotnet-sdk-6.0
3539

3640
- Download and extract the pre-built binary release archive from the release page
3741
https://github.com/aboutcode-org/nuget-inspector for your operating system. (Linux-only
@@ -43,7 +47,7 @@ Usage
4347

4448
For instance, you can fetch nuget-inspector own project file at::
4549

46-
https://raw.githubusercontent.com/nexB/nuget-inspector/main/src/nuget-inspector/nuget-inspector.csproj
50+
https://raw.githubusercontent.com/aboutcode-org/nuget-inspector/main/src/nuget-inspector/nuget-inspector.csproj
4751

4852
And then run::
4953

@@ -52,12 +56,17 @@ And then run::
5256
And review the ``nuget-inspector.json`` JSON output file with its resolved dependencies.
5357
Note that the output data structure is evolving and not final.
5458

59+
5560
Developement
5661
-------------
5762

5863
Getting started for development:
5964

6065
- Install the .NET SDK 6.x from https://dotnet.microsoft.com/en-us/download/dotnet/6.0
66+
- On debian and Ubuntu::
67+
68+
sudo apt-get install dotnet-sdk-6.0
69+
6170
- Install the VSCode from https://code.visualstudio.com/
6271
- Install the extension: C# for Visual Studio Code (powered by OmniSharp)
6372
from https://code.visualstudio.com/Docs/languages/csharp
@@ -67,11 +76,15 @@ To run the tests:
6776
- Run ``./build.sh`` to create a Linux build
6877
- Run ``./configure --dev`` once to setup the Python evnvironment used for testing
6978
- Run pytest with: ``venv/bin/pytest -vvs``
79+
- Run pytest in parallel with: ``venv/bin/pytest -vvs -n10``
80+
- Regen last failed tests JSON fixtures: ``REGEN_TEST_FIXTURES=yes venv/bin/pytest -vvs -n10 --lf``
81+
82+
7083

7184
License
7285
-------------
7386

74-
Copyright (c) nexB Inc. and others.
87+
Copyright (c) AboutCode, nexB Inc. and others.
7588

7689
Copyright (c) the .NET Foundation, Microsoft and others.
7790

‎azure-pipelines.yml‎

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

‎build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) nexB Inc. and others. All rights reserved.
3+
# Copyright (c) AboutCode, nexB Inc. and others. All rights reserved.
44
# SPDX-License-Identifier: Apache-2.0
55
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6-
# See https://github.com/nexB/nuget-inpector for support or download.
7-
# See https://aboutcode.org for more information about nexB OSS projects.
6+
# See https://github.com/aboutcode-org/nuget-inpector for support or download.
7+
# See https://aboutcode.org for more information about AboutCode OSS projects.
88
#
99

1010
# TODO: add --framework
@@ -17,6 +17,6 @@ dotnet publish \
1717
--runtime linux-x64 \
1818
--self-contained true \
1919
--configuration Release \
20-
-p:Version=0.9.12 \
20+
-p:Version=0.10.0 \
2121
--output build \
2222
src/nuget-inspector/nuget-inspector.csproj

0 commit comments

Comments
 (0)