Merge latest skeleton in python-inspector by swastkk · Pull Request #119 · aboutcode-org/python-inspector · GitHub

swastkk · 2023-01-18T13:41:46Z

Merged the template skeleton into python-inspector project.
SIgned-off-by: swastik swastkk@gmail.com

Signed-off-by: Chin Yeung Li <tli@nexb.com>

The following images are deprecated in GitHub actions and Azure DevOps: * `ubuntu-18.04` : actions/runner-images#6002 * `macos-10.15` : actions/runner-images#5583 Due to this there was failing tests due to planned brownouts. Updated ubuntu18 to ubuntu22 Updated macos-1015 to macos12 Signed-off-by: Chin Yeung Li <tli@nexb.com>

* Rename references to etc/release with etc/scripts Signed-off-by: Jono Yang <jyang@nexb.com>

3.7 is not available anymore on newer OSes and is retired in 2023. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

…pdate_ci Remove thirdparty and update ci

* import update in src/scripts/utils_dejacode * Packvers replacing packaging in other src/scripts * Added packvers in src/scripts/requirments.txt Signed-off-by: swastik <swastkk@gmail.com>

Replace packaging with packvers in src/scripts

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Also test on latest Ubuntu and macOS Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Signed-off-by: swastik <swastkk@gmail.com>

swastkk · 2023-01-27T17:59:58Z

@TG1999 review please :)

TG1999 · 2023-01-30T17:56:15Z

@swastkk tests are failing, please look into this

swastkk · 2023-01-30T18:13:06Z

@swastkk tests are failing, please look into this

okay :)

swastkk · 2023-02-04T18:13:22Z

Can you please help in solving these errors, actually solved the errors which were in resolution.py by changing the versions of the packages mentioned there, but in these errors, I am not able to find where to make changes.
Thanks in advance.

======================================== short test summary info =========================================
FAILED tests/test_api.py::test_api_with_specifier - assert {'files': [],\n 'packages': [{'api_data_url'...
FAILED tests/test_api.py::test_api_with_specifier_pdt - assert {'files': [],\n 'packages': [{'api_data_...
FAILED tests/test_api.py::test_api_with_requirement_file - assert {'files': [{'package_data': [{'api_da...
FAILED tests/test_api.py::test_api_with_prefer_source - assert {'files': [],\n 'packages': [{'api_data_...
FAILED tests/test_api.py::test_api_with_python_311 - assert {'files': [],\n 'packages': [{'api_data_url...
FAILED tests/test_cli.py::test_pdt_output_with_pinned_requirements - assert {'files': [{'package_data':...
FAILED tests/test_cli.py::test_pdt_output_with_frozen_requirements - assert {'files': [{'package_data':...
FAILED tests/test_cli.py::test_cli_with_single_index_url_except_pypi_simple - assert {'files': [],\n 'h...
FAILED tests/test_cli.py::test_cli_with_azure_devops_with_python_310 - assert {'files': [{'package_data...
FAILED tests/test_cli.py::test_cli_with_azure_devops_with_python_38 - assert {'files': [{'package_data'...
FAILED tests/test_cli.py::test_cli_with_pinned_requirements_file - assert {'files': [{'package_data': [...
======================= 11 failed, 112 passed, 1352 warnings in 299.90s (0:04:59) ========================

swastkk · 2023-02-04T19:09:20Z

like was having this error

tests/test_api.py:101:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

result_file = '/tmp/scancode-tk-tests -rsjax3qe/4kwmmz7f/td/tf.json'
expected_file = '/home/swastik/Desktop/Projects/python-inspector/tests/data/test-api-with-prefer-source.json'
clean = True, regen = False

    def check_json_results(result_file, expected_file, clean=True, regen=REGEN_TEST_FIXTURES):
        """
        Check the ``result_file`` JSON results against the ``expected_file``
        expected JSON results.

        If ``clean`` is True, remove headers data that can change across runs to
        provide stable test resultys.

        If ``regen`` is True the expected_file WILL BE overwritten with the new
        results from ``results_file``. This is convenient for updating tests
        expectations.
        """
        with open(result_file) as res:
            results = json.load(res)
        if regen:
            with open(expected_file, "w") as reg:
                json.dump(results, reg, indent=2, separators=(",", ": "))
            expected = results
        else:
            with open(expected_file) as res:
                expected = json.load(res)

                if clean:
                    clean_results(expected)
        if clean:
            results = clean_results(results)
>       assert results == expected
E       AssertionError: assert {'files': [],...zeug@2.2.2'}]} == {'files': [],...zeug@2.2.2'}]}
E         Omitting 1 identical items, use -vv to show
E         Differing items:
E         {'resolution': [{'dependencies': [], 'package': 'pkg:pypi/click@8.1.3'}, {'dependencies': ['pkg:pypi/click@8.1.3', 'pk...: 'pkg:pypi/markupsafe@2.1.2'}, {'dependencies': ['pkg:pypi/markupsafe@2.1.2'], 'package': 'pkg:pypi/werkzeug@2.2.2'}]} != {'resolution': [{'dependencies': [], 'package': 'pkg:pypi/click@8.1.3'}, {'dependencies': ['pkg:pypi/click@8.1.3', 'pk...: 'pkg:pypi/markupsafe@2.1.1'}, {'dependencies': ['pkg:pypi/markupsafe@2.1.1'], 'package': 'pkg:pypi/werkzeug@2.2.2'}]}
E         {'packages': [{'api_data_url': 'h...
E
E         ...Full output truncated (2 lines hidden), use '-vv' to show

tests/test_cli.py:495: AssertionError

how to approach these type of errors...?

TG1999 · 2023-02-06T16:19:12Z

@swastkk you can regen the test output by running these commands

$ source venv/bin/activate
$ PYINSP_REGEN_TEST_FIXTURES=yes pytest -vvs

swastkk · 2023-02-06T16:36:58Z

@swastkk you can regen the test output by running these commands
$ source venv/bin/activate
$ PYINSP_REGEN_TEST_FIXTURES=yes pytest -vvs

Yep, its done with all tests passing Thanks :)

TG1999 · 2023-02-06T16:50:23Z

@swastkk please squash commits from 37d6d74 to 440b1ea

TG1999

LGTM!

swastkk · 2023-04-11T13:46:08Z

@swastkk please rebase your branch

Sure, but for the rebase i have to pull the latest changes right? but it seems that the latest changes can't be fetched from the main branch

and after writing command getting this-

TG1999 · 2023-04-11T13:50:06Z

@swastkk please don't use main branch for PR purposes, instead always cut out a branch and make PR from that. Please run git remote -v and show the output for same here.

swastkk · 2023-04-11T13:52:53Z

Getting this after git remote -v

git remote -v
origin	https://github.com/swastkk/python-inspector (fetch)
origin	https://github.com/swastkk/python-inspector (push)
skeleton	git@github.com:nexB/skeleton (fetch)
skeleton	git@github.com:nexB/skeleton (push)

TG1999 · 2023-04-11T13:56:47Z

Please run these commands:

git remote add upstream https://github.com/nexB/python-inspector
git fetch upstream main
git rebase upstream/main

And let us know if you are able to rebase with this ?

swastkk · 2023-04-11T14:36:13Z

Please run these commands:
git remote add upstream https://github.com/nexB/python-inspector
git fetch upstream main
git rebase upstream/main
And let us know if you are able to rebase with this ?

Yes rebased, resolved the conflicts.
BUT it is asking for a New PR

TG1999 · 2023-04-11T14:43:24Z

@swastkk you did rebase on which branch ? Can you please run git status and show me the output for the command.

swastkk · 2023-04-11T14:46:13Z

@swastkk you did rebase on which branch ? Can you please run git status and show me the output for the command.

Ohh my bad, i think i rebased my old branch packvers-added instead of the changes i made in this PR which was in the main branch :"(

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

swastkk · 2023-04-11T14:48:04Z

I will rebase it with my main branch and that PR issue will be resolved.

Also test on latest Ubuntu and macOS Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Rename references to etc/release with etc/scripts Signed-off-by: Jono Yang <jyang@nexb.com>

3.7 is not available anymore on newer OSes and is retired in 2023. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Signed-off-by: swastik <swastkk@gmail.com> - Test errors resolve in tests/resolution.py - Bump the requirments packages to latest version - Test error resolve in test_resolution.py - Tests updated with PYINSP_REGEN_TEST_FIXTURES Signed-off-by: Swastik Sharma <swastkk@gmail.com>

swastkk · 2023-04-11T15:04:15Z

Done with rebase

I will rebase it with my main branch and that PR issue will be resolved.

Rebase DONE 🏁

TG1999 · 2023-04-11T15:05:38Z

@swastkk this PR now has unrelated changes : |

swastkk · 2023-04-11T15:08:54Z

@swastkk this PR now has unrelated changes : |

What to do now :"( ?

TG1999 · 2023-04-11T15:23:43Z

@pombredanne what are your thoughts on this ?

pombredanne · 2023-04-11T15:38:26Z

@pombredanne what are your thoughts on this ?

IMHO there was a snafu during the rebase. The best way is likely to restart anew... from a clean latest main branch base and merging back the latest skeleton again, then force push this

swastkk · 2023-04-11T15:46:42Z

@pombredanne what are your thoughts on this ?

IMHO there was a snafu during the rebase. The best way is likely to restart anew... from a clean latest main branch base and merging back the latest skeleton again, then force push this

Okay got it, making this PR as Draft for any reference and creating a New PR as soon as possible.

pombredanne · 2023-10-10T09:16:08Z

gentle ping ... we need the latest skeleton still :)

swastkk · 2023-10-10T09:17:46Z

Ok I will have a look!

pombredanne · 2023-10-10T09:42:40Z

@swastkk please sync up with @TG1999 as he may started doing it already.

pombredanne · 2023-10-13T10:00:03Z

@TG1999 merged a different branch with the same effect, so I am closing this. Thank you ++ for your efforts in all cases that are much appreciated!

chinyeungli and others added 15 commits September 22, 2022 16:45

Remove the thirdparty directory

04a872c

Signed-off-by: Chin Yeung Li <tli@nexb.com>

Add missing os import in utils_requirements.py

509b032

* Rename references to etc/release with etc/scripts Signed-off-by: Jono Yang <jyang@nexb.com>

Reinstate Ubuntu 18 and drop Python 3.6 and 3.7

c6bba07

3.7 is not available anymore on newer OSes and is retired in 2023. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Merge pull request aboutcode-org#68 from nexB/remove_thirdparty_and_u…

bec5391

…pdate_ci Remove thirdparty and update ci

Replace packaging with packvers

1bd7a2f

* import update in src/scripts/utils_dejacode * Packvers replacing packaging in other src/scripts * Added packvers in src/scripts/requirments.txt Signed-off-by: swastik <swastkk@gmail.com>

Merge pull request aboutcode-org#71 from swastkk/packvers-added

5be2690

Replace packaging with packvers in src/scripts

Ignore egginfo

6f21d2b

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Drop Python 3.7 add Python 3.11

f841c2f

Also test on latest Ubuntu and macOS Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Clean .cache and .eggs

bd2a464

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Add COC to redistributed license-like files

6270a88

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Add new Makefile

d3a19bd

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Align scripts with latest ScanCode Toolkit

91f5613

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Merge latest main branch

1205bc0

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Aligning project with Template skeleton

37d6d74

Signed-off-by: swastik <swastkk@gmail.com>

TG1999 requested changes Jan 18, 2023

View reviewed changes

Comment thread azure-pipelines.yml

Comment thread azure-pipelines.yml

swastkk requested a review from TG1999 January 19, 2023 14:26

swastkk force-pushed the main branch from 2d9e6ff to d5dd2ad Compare January 24, 2023 19:28

swastkk changed the title ~~Aligning project with template skeleton~~ Merge latest skeleton in python-inspector Jan 24, 2023

swastkk force-pushed the main branch from d5dd2ad to 9c4f7c2 Compare January 24, 2023 19:40

This comment was marked as resolved.

Sign in to view

swastkk force-pushed the main branch from 440b1ea to fd7236a Compare February 6, 2023 17:21

TG1999 approved these changes Apr 11, 2023

View reviewed changes

TG1999 requested a review from pombredanne April 11, 2023 13:02

Ignore egginfo

00fdf84

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

pombredanne and others added 7 commits April 11, 2023 20:21

Drop Python 3.7 add Python 3.11

4160e3b

Also test on latest Ubuntu and macOS Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Add COC to redistributed license-like files

c2bf00c

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Align scripts with latest ScanCode Toolkit

81c3a01

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Add missing os import in utils_requirements.py

f909a7a

* Rename references to etc/release with etc/scripts Signed-off-by: Jono Yang <jyang@nexb.com>

Reinstate Ubuntu 18 and drop Python 3.6 and 3.7

c06c5a6

3.7 is not available anymore on newer OSes and is retired in 2023. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Merge branch 'main' of https://github.com/swastkk/python-inspector

5b49b25

pombredanne mentioned this pull request Aug 3, 2023

relative links_fix #134

Merged

pombredanne closed this Oct 13, 2023

Uh oh!

Conversation

swastkk commented Jan 18, 2023

Uh oh!

Uh oh!

Uh oh!

swastkk commented Jan 27, 2023

Uh oh!

TG1999 commented Jan 30, 2023

Uh oh!

swastkk commented Jan 30, 2023

Uh oh!

swastkk commented Feb 4, 2023

Uh oh!

swastkk commented Feb 4, 2023

Uh oh!

TG1999 commented Feb 6, 2023

Uh oh!

swastkk commented Feb 6, 2023

Uh oh!

TG1999 commented Feb 6, 2023

Uh oh!

This comment was marked as resolved.

TG1999 left a comment

Choose a reason for hiding this comment

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

TG1999 commented Apr 11, 2023

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

TG1999 commented Apr 11, 2023

Uh oh!

swastkk commented Apr 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TG1999 commented Apr 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

TG1999 commented Apr 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

TG1999 commented Apr 11, 2023

Uh oh!

pombredanne commented Apr 11, 2023

Uh oh!

swastkk commented Apr 11, 2023

Uh oh!

pombredanne commented Oct 10, 2023

Uh oh!

swastkk commented Oct 10, 2023

Uh oh!

pombredanne commented Oct 10, 2023

Uh oh!

pombredanne commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

swastkk commented Apr 11, 2023 •

edited

Loading

TG1999 commented Apr 11, 2023 •

edited

Loading

TG1999 commented Apr 11, 2023 •

edited

Loading