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.

Sign up for GitHub

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

Jump to bottom

Upgrade Deltacode to use Skeleton and support python 3.8+ #182 #187

Merged
merged 148 commits into from
Mar 28, 2023
Merged

Upgrade Deltacode to use Skeleton and support python 3.8+ #182 #187

merged 148 commits into from
Mar 28, 2023

Conversation

arnav-mandal1234
Copy link
Collaborator

@arnav-mandal1234 arnav-mandal1234 commented Mar 21, 2023 •
edited

  • Delete thirdparty/ and unnecessary files.
  • Delete Deltacode, Deltacode.bat, test.csv and expected.json.
  • Change from bitarray import bitdiff to from bitarray.util import count_xor.
  • Upgrade bitarray to support python 3.7+.
  • Added dependencies in requirements.txt and requirements-dev.txt.

Signed-off-by: Arnav Mandal arnav.mandal1234@gmail.com

No Author and others added 30 commits February 28, 2003 18:13
New repository initialized by cvs2svn.
421d175 
git-svn-id: svn+ssh://rubyforge.org/var/svn/rubygems/trunk@1 3d4018f9-ac1a-0410-99e9-8a154d859a19
@agustinhenze
Initial commit
5664513
Initial commit
c7ba5bd
@pombredanne
Initial commit
c83207d
@pombredanne
Merge branch 'dlt-master'
7ab4312
@pombredanne
Use wheels embedded in virtualenv.pyz
182532f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Do not force an upgrade on virtualenv.pyz embeds
cd4e87b 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Merge pull request nexB#24 from nexB/use-venv-embeds
1c84e9e 
Use virtualenv-embedded libraries
@pombredanne
Update markers syntax for pytest
d6fe59f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add fallback version for setuptools_scm
ca6ab21 
This will work even from a git archive or when git is not installed.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add note for setuptools_scam fallback version
1364bbb 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Use azure-posix.yml for linux and macOS
be851b0 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Adopt new configure script derived from ScanCode
4f0aecf 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add notes on customization
aa04429 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Adopt new configure --dev convention
56ada8f 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Clarify CHANGELOG to be Rst
0dbcdc9 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add skeleton release notes to README.rst
d21aef3 
This was they do not end up in the template CHANGELOG.rst

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Merge pull request nexB#25 from nexB/new-configure
a75737d 
New configure
@pombredanne
Update format
3aeb2ec 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add Python 3.9 to Travis
2c412e8 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Format and remove spurious spaces
69eec23 
From nexB/typecode#20

Reported-by: Pierre Tardy <pierre.tardy@renault.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Bump to more modern version of setuptools_scm
0e09ad9 
And remove v prefix from fallback version

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Add space for correct syntax
e339a70 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@chinyeungli
Create junction from Scripts to bin
9dff54a 
 * This is handy for windows to have the same path as linux

Signed-off-by: Chin Yeung Li <tli@nexb.com>
@pombredanne
Merge pull request nexB#26 from nexB/windows-junction
b735a3f 
Create junction from Scripts to bin
@JonoYang
Check for deps in local thirdparty directory nexB#31
77ce5e4 
Signed-off-by: Jono Yang <jyang@nexb.com>
@JonoYang
Merge pull request nexB#32 from nexB/install-from-thirdparty-dir
fa13562 
Check for deps in local thirdparty directory nexB#31
@JonoYang
Enforce use of requirements.txt nexB#34
1bcaaa5 
Signed-off-by: Jono Yang <jyang@nexb.com>
@JonoYang
Add scripts from scancode-toolkit/etc/release/ nexB#33
e9067c8 
Signed-off-by: Jono Yang <jyang@nexb.com>
@JonoYang
Normalize license in load_pkginfo_data nexB#33
0e1f56b 
    * Create copyright statement from holder information

Signed-off-by: Jono Yang <jyang@nexb.com>
@pombredanne
Merge latest main branch
1205bc0 
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@arnav-mandal1234 arnav-mandal1234 force-pushed the skeleton_upgrade branch 2 times, most recently from 8927679 to d7cb1f7 Compare March 22, 2023 15:44
@arnav-mandal1234
Copy link
Collaborator Author

Setting DCO test to pass as skeleton had some commits which had no sign-offs. The latest commit has the sign-off.

@arnav-mandal1234 arnav-mandal1234 changed the title [WIP] Skeleton upgrade Upgrade Deltacode to use Skeleton and python 3.7+ Mar 22, 2023
AyanSinhaMahapatra
AyanSinhaMahapatra requested changes Mar 24, 2023
View reviewed changes
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments for a few changes, looking good otherwise! Thanks!

requirements-dev.txt Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
tests/test_skeleton_codestyle.py Outdated Show resolved Hide resolved
.github/workflows/docs-ci.yml Show resolved Hide resolved
@arnav-mandal1234 arnav-mandal1234 force-pushed the skeleton_upgrade branch 8 times, most recently from 18309c2 to df10d63 Compare March 24, 2023 12:00
AyanSinhaMahapatra
AyanSinhaMahapatra requested changes Mar 24, 2023
View reviewed changes
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See some more comments for your consideration. Thanks! Looking like we'll be ready after these changes. Thanks!

CHANGELOG.rst Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
azure-pipelines.yml Outdated Show resolved Hide resolved
docs/source/contribute/contrib_doc.rst Outdated Show resolved Hide resolved
docs/source/deltacode/comprehensive_installation.rst Show resolved Hide resolved
etc/scripts/utils_dejacode.py Show resolved Hide resolved
@arnav-mandal1234
Upgrade Deltacode to use Skeleton and python 3.7+
bfdfaa9 
 * Delete `thirdparty/` and unnecessary files.
 * Delete `Deltacode`, `Deltacode.bat`, `test.csv` and `expected.json`.
 * Change `from bitarray import bitdiff` to `from bitarray.util import count_xor`.
 * Upgrade bitarray to support python 3.7+.
 * Added dependencies in `requirements.txt` and `requirements-dev.txt`.

Signed-off-by: Arnav Mandal <arnav.mandal1234@gmail.com>
@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Upgrade Deltacode to use Skeleton and python 3.7+ Upgrade Deltacode to use Skeleton and support python 3.8+ Mar 24, 2023
AyanSinhaMahapatra
AyanSinhaMahapatra approved these changes Mar 24, 2023
View reviewed changes
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arnav-mandal1234 thanks! LGTM!

@pombredanne this is ready for you to review!

@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Upgrade Deltacode to use Skeleton and support python 3.8+ Upgrade Deltacode to use Skeleton and support python 3.8+ #182 Mar 27, 2023
@AyanSinhaMahapatra AyanSinhaMahapatra linked an issue Mar 27, 2023 that may be closed by this pull request
Update structure to use the https://github.com/nexB/skeleton #182
Closed
JonoYang
JonoYang reviewed Mar 27, 2023
View reviewed changes
Copy link
Contributor

@JonoYang JonoYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Just left a comment about updating the commands under the quick start guide in the README

README.rst Show resolved Hide resolved
pombredanne
pombredanne approved these changes Mar 28, 2023
View reviewed changes
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@AyanSinhaMahapatra
Copy link
Member

AyanSinhaMahapatra commented Mar 28, 2023 •
edited

Thanks+++ @arnav-mandal1234
Merging!

@AyanSinhaMahapatra AyanSinhaMahapatra merged commit 333c392 into nexB:develop Mar 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JonoYang JonoYang JonoYang left review comments

@pombredanne pombredanne pombredanne approved these changes

@AyanSinhaMahapatra AyanSinhaMahapatra AyanSinhaMahapatra approved these changes

@steven-esser steven-esser Awaiting requested review from steven-esser

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update structure to use the https://github.com/nexB/skeleton
9 participants
@arnav-mandal1234 @AyanSinhaMahapatra @pombredanne @JonoYang @agustinhenze @chinyeungli @TG1999 @keshav-space @swastkk