Merge pull request #151 from slashmili/use-jalali-core

Use jalali core

CHANGELOG.md

@@ -1,14 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## [5.0.0] - 2024-03-26
 
 ### Add
 * Add support for Python 3.12
-* add LGPL licence for jalali.py file
 
 ### Changed
 * BREAKING CHANGE: Arithmetic operations on `date`/`datetime` against an unknown type will now return `NotImplemented` instead of raising `TypeError`
 * Drop Python 3.7 support
+* Move jalali.py to jalali_core dependency due to licensing issues #148
 
 ### Fixed
 * treat %% as an escape sequence in strftime

LICENSE

@@ -3,24 +3,3 @@ jdatetime is (c) 2010-2018 Milad Rastian <eslashmili at gmail.com>.
 The jdatetime module was contributed to Python as of Python 2.7 and thus
 was licensed under the Python license. Same license applies to all files in
 the jdatetime package project.
-
-The algorithms to convert between Jalali and Gregorian dates, are based on
-FarsiWeb's jalali.c library (http://www.farsiweb.info/jalali/jalali.c).
-
-Copyright (C) 2001  Roozbeh Pournader <[email protected]>
-Copyright (C) 2001  Mohammad Toossi <[email protected]>
-Copyright (C) 2003-2011 Parspooyesh Fanavar (http://parspooyesh.com/)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You can receive a copy of GNU Lesser General Public License at the
-World Wide Web address <http://www.gnu.org/licenses/lgpl.html>.
-

README.rst

@@ -3,11 +3,6 @@ jdatetime
 
 jdatetime is Jalali_ implementation of Python's datetime module
 
-Licence
--------
-This pacakge is released under dual licenses, check LICENSE file for more information.
-
-
 Status
 ------
 

jdatetime/__init__.py

@@ -14,11 +14,9 @@
 except ImportError:
     from _thread import get_ident
 
-from jdatetime.jalali import (
-    GregorianToJalali, JalaliToGregorian, j_days_in_month,
-)
+from jalali_core import GregorianToJalali, JalaliToGregorian, j_days_in_month
 
-__VERSION__ = "4.1.1"
+__VERSION__ = "5.0.0"
 MINYEAR = 1
 MAXYEAR = 9377
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='jdatetime',
-    version='4.1.1',
+    version='5.0.0',
     packages=['jdatetime', ],
     license='Python Software Foundation License',
     keywords='Jalali implementation of Python datetime',
@@ -15,6 +15,7 @@
     url="https://github.com/slashmili/python-jalali",
     long_description=open('README').read(),
     python_requires=">=3.8",
+    install_requires=["jalali-core>=1.0"],
     classifiers=[
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",