Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jalali core #151

Merged
merged 7 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Changelog

## [Unreleased]
## [5.0.0] - YYYY-MM-DD

### 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
* Use jalali.py as jalali_core dependency #148

### Fixed
* treat %% as an escape sequence in strftime
Expand Down
21 changes: 0 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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 <roozbeh@sharif.edu>
Copyright (C) 2001 Mohammad Toossi <mohammad@bamdad.org>
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>.

5 changes: 0 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------

Expand Down
5 changes: 2 additions & 3 deletions jdatetime/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
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
hramezani marked this conversation as resolved.
Show resolved Hide resolved

hramezani marked this conversation as resolved.
Show resolved Hide resolved

__VERSION__ = "4.1.1"
MINYEAR = 1
Expand Down
129 changes: 0 additions & 129 deletions jdatetime/jalali.py

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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",
Expand Down
Loading