Kaynağa Gözat

almost ready for issue #1, can upload to testpypi however pip install fails

Matthew Wang 11 yıl önce
ebeveyn
işleme
d24697cf6c
4 değiştirilmiş dosya ile 18 ekleme ve 8 silme
  1. 11
    4
      Makefile
  2. 3
    0
      README.rst
  3. 2
    2
      setup.py
  4. 2
    2
      src/cdiff.py

+ 11
- 4
Makefile Dosyayı Görüntüle

1
 # Makefile for testing
1
 # Makefile for testing
2
 
2
 
3
 TESTS = git svn crlf strange
3
 TESTS = git svn crlf strange
4
+TESTPYPI = http://testpypi.python.org/pypi
4
 
5
 
5
-.PHONY: dogfood test $(TESTS) clean sdist
6
+.PHONY: dogfood test $(TESTS) clean dist
6
 
7
 
7
 dogfood:
8
 dogfood:
8
 	src/cdiff.py -s
9
 	src/cdiff.py -s
20
 	python3 src/cdiff.py tests/$@.diff | diff -u tests/$@.diff -
21
 	python3 src/cdiff.py tests/$@.diff | diff -u tests/$@.diff -
21
 
22
 
22
 clean:
23
 clean:
23
-	rm -rf build/ cdiff.egg-info/ dist/
24
+	rm -rf MANIFEST build/ cdiff.egg-info/ dist/
24
 
25
 
25
-sdist:
26
-	./setup.py sdist
26
+dist-test:
27
+	./setup.py build sdist upload -r $(TESTPYPI)
28
+
29
+install-test:
30
+	pip install -r $(TESTPYPI)
31
+
32
+dist:
33
+	./setup.py build sdist upload
27
 
34
 
28
 # vim:set noet ts=8 sw=8:
35
 # vim:set noet ts=8 sw=8:

+ 3
- 0
README.rst Dosyayı Görüntüle

6
 
6
 
7
 .. image:: http://ymattw.github.com/cdiff/img/default.png
7
 .. image:: http://ymattw.github.com/cdiff/img/default.png
8
    :alt: default
8
    :alt: default
9
+   :align: center
9
 
10
 
10
 .. image:: http://ymattw.github.com/cdiff/img/side-by-side.png
11
 .. image:: http://ymattw.github.com/cdiff/img/side-by-side.png
11
    :alt: side by side
12
    :alt: side by side
13
+   :align: center
14
+   :width: 900 px
12
 
15
 
13
 Installation
16
 Installation
14
 ------------
17
 ------------

+ 2
- 2
setup.py Dosyayı Görüntüle

12
     author = 'Matthew Wang',
12
     author = 'Matthew Wang',
13
     author_email = 'mattwyl@gmail.com',
13
     author_email = 'mattwyl@gmail.com',
14
     license = 'BSD-3',
14
     license = 'BSD-3',
15
-    description = ('View incremental, colored diff in unified format or side '
15
+    description = ('View colored, incremental diff in unified format or side '
16
                    'by side with auto pager'),
16
                    'by side with auto pager'),
17
     long_description = long_description,
17
     long_description = long_description,
18
-    keywords = 'incremental colored side-by-side diff',
18
+    keywords = 'colored incremental side-by-side diff',
19
     url = 'https://github.com/ymattw/cdiff',
19
     url = 'https://github.com/ymattw/cdiff',
20
     classifiers = [
20
     classifiers = [
21
         'Development Status :: 3 - Alpha',
21
         'Development Status :: 3 - Alpha',

+ 2
- 2
src/cdiff.py Dosyayı Görüntüle

2
 # -*- coding: utf-8 -*-
2
 # -*- coding: utf-8 -*-
3
 
3
 
4
 """
4
 """
5
-View incremental, colored diff in unified format or in side by side mode with
5
+View colored, incremental diff in unified format or in side by side mode with
6
 auto pager.  Requires Python (>= 2.5.0) and less.
6
 auto pager.  Requires Python (>= 2.5.0) and less.
7
 
7
 
8
 See demo at homepage: https://github.com/ymattw/cdiff
8
 See demo at homepage: https://github.com/ymattw/cdiff
516
     supported_vcs = [check[0] for check, _ in REVISION_CONTROL]
516
     supported_vcs = [check[0] for check, _ in REVISION_CONTROL]
517
 
517
 
518
     usage = '%s [options] [diff]' % os.path.basename(sys.argv[0])
518
     usage = '%s [options] [diff]' % os.path.basename(sys.argv[0])
519
-    description= ('View incremental, colored diff in unified format or '
519
+    description= ('View colored, incremental diff in unified format or '
520
                   'side by side with auto pager.  Read diff from diff '
520
                   'side by side with auto pager.  Read diff from diff '
521
                   '(patch) file if given, or stdin if redirected, or '
521
                   '(patch) file if given, or stdin if redirected, or '
522
                   'diff produced by revision tool if in a %s workspace') \
522
                   'diff produced by revision tool if in a %s workspace') \