Merge pull request #46 from amitgaru2/develop

Develop
amitgaru2 · Sep 4, 2023 · 4be49f1 · 4be49f1
2 parents 10aa929 + de95df0
commit 4be49f1
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 5 deletions.
diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
diff --git a/docs/doctrees/index.doctree b/docs/doctrees/index.doctree
diff --git a/docs/html/_sources/index.rst.txt b/docs/html/_sources/index.rst.txt
@@ -713,9 +713,16 @@ Directives   Meaning                          Example                  Notes
              or -HHMM (empty string if the    +1030                         
              object is naive).                                             
 
-``%Z``       Time zone name (empty string     (empty), UTC, EST, CST        
+``%Z``       Time zone name (empty string     (empty), UTC, EST, CST
              if the object is naive).                                      
 
+``%U``       Week number of the year (Sunday  00, 01, ..., 53            \(7)
+             as the first day of the week)
+             as a zero padded decimal number.
+             All days in a new year preceding
+             the first Sunday are considered
+             to be in week 0.
+
 ===========  ================================ ======================== =======
 
 

diff --git a/docs/html/index.html b/docs/html/index.html
@@ -900,6 +900,16 @@ <h2><a class="reference internal" href="#nepali_datetime.datetime" title="nepali
 <td><p>(empty), UTC, EST, CST</p></td>
 <td></td>
 </tr>
+<tr class="row-odd"><td><p><code class="docutils literal notranslate"><span class="pre">%U</span></code></p></td>
+<td><p>Week number of the year (Sunday
+as the first day of the week)
+as a zero padded decimal number.
+All days in a new year preceding
+the first Sunday are considered
+to be in week 0.</p></td>
+<td><p>00, 01, …, 53</p></td>
+<td><p>(7)</p></td>
+</tr>
 </tbody>
 </table>
 <p>Notes:</p>

diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -713,9 +713,16 @@ Directives   Meaning                          Example                  Notes
              or -HHMM (empty string if the    +1030                         
              object is naive).                                             
 
-``%Z``       Time zone name (empty string     (empty), UTC, EST, CST        
+``%Z``       Time zone name (empty string     (empty), UTC, EST, CST
              if the object is naive).                                      
 
+``%U``       Week number of the year (Sunday  00, 01, ..., 53            \(7)
+             as the first day of the week)
+             as a zero padded decimal number.
+             All days in a new year preceding
+             the first Sunday are considered
+             to be in week 0.
+
 ===========  ================================ ======================== =======
 
 

diff --git a/nepali_datetime/__init__.py b/nepali_datetime/__init__.py
@@ -5,7 +5,7 @@
 
 Supports >= Python3.5
 """
-__version__ = "1.0.8"
+__version__ = "1.0.8.1"
 
 __author__ = "Amit Garu <amitgaru2@gmail.com>"
 
@@ -58,6 +58,7 @@
     'l': lambda o: ''.join(_DIGIT_NP[int(i)] for i in '%02d' % getattr(o, 'minute', 0)),
     'S': lambda o: '%02d' % getattr(o, 'second', 0),
     's': lambda o: ''.join(_DIGIT_NP[int(i)] for i in '%02d' % getattr(o, 'second', 0)),
+    'U': lambda o: '%02d' % ((o.timetuple().tm_yday + 7 - o.weekday()) // 7,),
 }
 
 _CALENDAR = {}

diff --git a/tests/test_strftime_strptime.py b/tests/test_strftime_strptime.py
@@ -14,7 +14,7 @@ def test_strftime_date(self):
 
     def test_strftime_datetime(self):
         dt = nepali_datetime.datetime(2052, 10, 29, 15, 22, 50, 2222)
-        assert dt.strftime("%m/%d/%Y %I:%M:%S.%f %p %a %A") == "10/29/2052 03:22:50.002222 PM Mon Monday"
+        assert dt.strftime("%m/%d/%Y %I:%M:%S.%f %p %a %A %U") == "10/29/2052 03:22:50.002222 PM Mon Monday 44"
 
 
 class TestStrptime: