Comments (11)
Added, with cdede39, and released as 1.7.6.
from icdiff.
Excellent, thanks! I wonder if you could also update the test files so they also contain a copyright and license info. See my original comment above, as well as #70.
from icdiff.
All test files except input-3 (which you fixed) are trivial; do you really think it's worth it?
from icdiff.
The problem is that in Debian we need to be able to prove that a given file is under a free license, and that is only possible in the newer version of the UTF8 file (input-3.txt
and tests/b/1
) I added in #70 as only this one has 'CC-BY' explicitly mentioned in the text.
Please note that with your commit 440de77 the file tests/b/1
is still the old one without the license notice. This will still impede redistribution.
The rest of the changes in #70 was necessary to keep the tests passing as the new UTF8 file is slightly different than the previous one, causing slightly different output. I did a --regold
to update the reference output. I hope that was OK.
AFAICS to fully solve this, all changes would need to be merged, unless I missed something.
from icdiff.
Sorry, I've fixed tests/b/1
and regolded. Version 1.8.1 should be what you want. I think we're all set now?
from icdiff.
That was quick, many thanks! Unfortunately, there's one thing left: I now run into the problem described by #72, #73 and #75. I suggest you separate the icdiff
tool from the module to be loaded so you do not have to rename the tool to icdiff.py
-- globally available commands with script extensions are discouraged in Debian and I would have to work around it. Also, there are good arguments for not doing so (https://wiki.debian.org/UpstreamGuide#Language_extensions_in_scripts).
That indeed seems to be the last remaining request :)
from icdiff.
Great work, guys! Looking forward to seeing icdiff packaged for Debian. Thanks a lot.
from icdiff.
Regarding my last comment, please also see PR #79.
from icdiff.
Just for the record, I would be really happy to see #75 merged as it is a better solution than my proposal. That would get me going again for finishing up the packaging.
from icdiff.
The problem with #75 is the same as #79: I want to still have a icdiff
on your PATH
as icdiff
and not icdiff.py
but I also want to provide a simple copy-paste install for people who want that.
from icdiff.
Ah, I see and I do understand that. I was just asking because in the current 1.8.1 the setup.py
is broken due to #72, so I won't be able to package this 'the Python way' without either locally reverting the module functionality (commit 46d5a72) or applying #75 to the Debian version. Since I usually like to stick with the original upstream I was looking for a way to sort it out...
Does anyone possibly have other suggestions?
from icdiff.
Related Issues (20)
- Apt package? HOT 2
- update icdiff on pypi.org to latest version HOT 2
- ChangeLog does not mention versions newer than 1.9.4 HOT 1
- BUG: Filenames show as mismatch when using exclusions
- Bug report: configuration for `git icdiff` did not work HOT 2
- installing the latest release-2.0.0 requires different command than install instructions HOT 2
- icdiff doesn't work on windows HOT 2
- Add support to specify colors using RGB ? HOT 1
- Add Support for custom patch hunk headers (with some builtins) HOT 1
- It seems have some problem about utf-8 HOT 1
- git icdiff shows old filname for renamed files HOT 2
- Multi-version of the Python HOT 1
- Exit code 1 using process substitutions HOT 4
- Pip install with `--platform` showing ERROR HOT 2
- [issue] linux more shows empty line. ex) icdiff -N fileA fileB | more -60 HOT 1
- Config file HOT 1
- Feature Request: Add an option to output directories before the files (recursively) HOT 1
- icdiff hanging on large files HOT 5
- Not clear how to install icdiff HOT 2
- Publish wheels for icdiff HOT 3
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from icdiff.