Skip to content

Commit 66c9523

Browse files
committed
Merge pull request #2 from lidaobing/release
release 0.1.5
2 parents 71b1881 + 5f299a6 commit 66c9523

File tree

6 files changed

+62
-66
lines changed

6 files changed

+62
-66
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.pyc
22
*.swp
3+
build
4+
dist

README.rst

+3
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@ Usage
5555
True
5656
>>> ld == ld
5757
True
58+
>>> LunarDate.today() == LunarDate.today()
59+
True
5860

5961
News
6062
----
6163

64+
* 0.1.5: fix bug in `==`
6265
* 0.1.4: support '+', '-' and compare, fix bug in year 2050
6366
* 0.1.3: support python 3.0
6467

lunardate.egg-info/PKG-INFO

+53-57
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Metadata-Version: 1.0
1+
Metadata-Version: 1.1
22
Name: lunardate
3-
Version: 0.1.4
3+
Version: 0.1.5
44
Summary: A Chinese Calendar Library in Pure Python
5-
Home-page: http://code.google.com/p/python-lunardate
5+
Home-page: https://github.com/lidaobing/python-lunardate
66
Author: LI Daobing
77
Author-email: [email protected]
88
License: GPLv3
@@ -14,60 +14,56 @@ Description:
1414

1515
Usage
1616
-----
17-
>>> LunarDate.fromSolarDate(1976, 10, 1)
18-
LunarDate(1976, 8, 8, 1)
19-
>>> LunarDate(1976, 8, 8, 1).toSolarDate()
20-
datetime.date(1976, 10, 1)
21-
>>> LunarDate(1976, 8, 8, 1).year
22-
1976
23-
>>> LunarDate(1976, 8, 8, 1).month
24-
8
25-
>>> LunarDate(1976, 8, 8, 1).day
26-
8
27-
>>> LunarDate(1976, 8, 8, 1).isLeapMonth
28-
True
17+
>>> LunarDate.fromSolarDate(1976, 10, 1)
18+
LunarDate(1976, 8, 8, 1)
19+
>>> LunarDate(1976, 8, 8, 1).toSolarDate()
20+
datetime.date(1976, 10, 1)
21+
>>> LunarDate(1976, 8, 8, 1).year
22+
1976
23+
>>> LunarDate(1976, 8, 8, 1).month
24+
8
25+
>>> LunarDate(1976, 8, 8, 1).day
26+
8
27+
>>> LunarDate(1976, 8, 8, 1).isLeapMonth
28+
True
2929

30-
>>> today = LunarDate.today()
31-
>>> type(today).__name__
32-
'LunarDate'
30+
>>> today = LunarDate.today()
31+
>>> type(today).__name__
32+
'LunarDate'
3333

34-
>>> # support '+' and '-' between datetime.date and datetime.timedelta
35-
>>> ld = LunarDate(1976,8,8)
36-
>>> sd = datetime.date(2008,1,1)
37-
>>> td = datetime.timedelta(days=10)
38-
>>> ld-ld
39-
datetime.timedelta(0)
40-
>>> ld-sd
41-
datetime.timedelta(-11444)
42-
>>> ld-td
43-
LunarDate(1976, 7, 27, 0)
44-
>>> sd-ld
45-
datetime.timedelta(11444)
46-
>>> ld+td
47-
LunarDate(1976, 8, 18, 0)
48-
>>> td+ld
49-
LunarDate(1976, 8, 18, 0)
50-
>>> ld2 = LunarDate.today()
51-
>>> ld < ld2
52-
True
53-
>>> ld <= ld2
54-
True
55-
>>> ld > ld2
56-
False
57-
>>> ld >= ld2
58-
False
59-
>>> ld == ld2
60-
False
61-
>>> ld != ld2
62-
True
63-
>>> ld == ld
64-
True
65-
66-
News
67-
----
68-
69-
* 0.1.4: support '+', '-' and compare, fix bug in year 2050
70-
* 0.1.3: support python 3.0
34+
>>> # support '+' and '-' between datetime.date and datetime.timedelta
35+
>>> ld = LunarDate(1976,8,8)
36+
>>> sd = datetime.date(2008,1,1)
37+
>>> td = datetime.timedelta(days=10)
38+
>>> ld-ld
39+
datetime.timedelta(0)
40+
>>> ld-sd
41+
datetime.timedelta(-11444)
42+
>>> ld-td
43+
LunarDate(1976, 7, 27, 0)
44+
>>> sd-ld
45+
datetime.timedelta(11444)
46+
>>> ld+td
47+
LunarDate(1976, 8, 18, 0)
48+
>>> td+ld
49+
LunarDate(1976, 8, 18, 0)
50+
>>> ld2 = LunarDate.today()
51+
>>> ld < ld2
52+
True
53+
>>> ld <= ld2
54+
True
55+
>>> ld > ld2
56+
False
57+
>>> ld >= ld2
58+
False
59+
>>> ld == ld2
60+
False
61+
>>> ld != ld2
62+
True
63+
>>> ld == ld
64+
True
65+
>>> LunarDate.today() == LunarDate.today()
66+
True
7167

7268
Limits
7369
------
@@ -78,9 +74,9 @@ Description:
7874
--------
7975

8076
* lunar: http://packages.qa.debian.org/l/lunar.html,
81-
A converter written in C, this program is derived from it.
77+
A converter written in C, this program is derived from it.
8278
* python-lunar: http://code.google.com/p/liblunar/
83-
Another library written in C, including a python binding.
79+
Another library written in C, including a python binding.
8480

8581
Platform: UNKNOWN
8682
Classifier: Development Status :: 4 - Beta

lunardate.egg-info/SOURCES.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
README.rst
12
lunardate.py
23
setup.py
34
lunardate.egg-info/PKG-INFO

lunardate.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@
6565
>>> LunarDate.today() == LunarDate.today()
6666
True
6767
68-
News
69-
----
70-
71-
* 0.1.4: support '+', '-' and compare, fix bug in year 2050
72-
* 0.1.3: support python 3.0
73-
7468
Limits
7569
------
7670
@@ -87,7 +81,7 @@
8781

8882
import datetime
8983

90-
__version__ = "0.1.4"
84+
__version__ = "0.1.5"
9185
__all__ = ['LunarDate']
9286

9387
class LunarDate(object):

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import lunardate
66

77
setup(name='lunardate',
8-
version='0.1.4',
8+
version='0.1.5',
99
py_modules = ['lunardate'],
1010
description = 'A Chinese Calendar Library in Pure Python',
1111
long_description = lunardate.__doc__,
1212
author = 'LI Daobing',
1313
author_email = '[email protected]',
14-
url = 'http://code.google.com/p/python-lunardate',
14+
url = 'https://github.com/lidaobing/python-lunardate',
1515
license = 'GPLv3',
1616
classifiers = [
1717
'Development Status :: 4 - Beta',

0 commit comments

Comments
 (0)