Skip to content

Commit

Permalink
isort + version update
Browse files Browse the repository at this point in the history
  • Loading branch information
Joseph Hamman committed Apr 13, 2018
1 parent a54b55e commit 0cf9051
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cftime/_cftime.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _units = microsec_units+millisec_units+sec_units+min_units+hr_units+day_units
_calendars = ['standard', 'gregorian', 'proleptic_gregorian',
'noleap', 'julian', 'all_leap', '365_day', '366_day', '360_day']

__version__ = '1.0.0a2'
__version__ = '1.0.0a3'

# Adapted from http://delete.me.uk/2005/03/iso8601.html
# Note: This regex ensures that all ISO8601 timezone formats are accepted - but, due to legacy support for other timestrings, not all incorrect formats can be rejected.
Expand Down
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import os
from setuptools import setup, Extension

from setuptools import Extension, setup

rootpath = os.path.abspath(os.path.dirname(__file__))


def extract_version(module='cftime'):
version = None
fname = os.path.join(rootpath, module, '_cftime.pyx')
Expand All @@ -14,6 +16,7 @@ def extract_version(module='cftime'):
break
return version


with open('requirements.txt') as f:
reqs = f.readlines()
install_requires = [req.strip() for req in reqs]
Expand All @@ -29,7 +32,7 @@ def extract_version(module='cftime'):
description='Time-handling functionality from netcdf4-python',
packages=['cftime'],
version=extract_version(),
ext_modules=[Extension('cftime._cftime',sources=['cftime/_cftime.pyx'])],
ext_modules=[Extension('cftime._cftime', sources=['cftime/_cftime.pyx'])],
setup_requires=install_requires,
install_requires=install_requires,
tests_require=tests_require)
12 changes: 5 additions & 7 deletions test/test_netcdftime.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import copy
import pytest
import unittest
from collections import namedtuple
from datetime import datetime, timedelta

import numpy as np
import pytest
from numpy.testing import assert_almost_equal, assert_equal

from cftime import datetime as datetimex
from cftime import (utime, JulianDayFromDate, DateFromJulianDay,
DatetimeNoLeap, DatetimeAllLeap, Datetime360Day,
DatetimeJulian, DatetimeGregorian,
DatetimeProlepticGregorian)
from cftime import num2date, date2num, date2index, _parse_date

from cftime import (DateFromJulianDay, Datetime360Day, DatetimeAllLeap,
DatetimeGregorian, DatetimeJulian, DatetimeNoLeap,
DatetimeProlepticGregorian, JulianDayFromDate, _parse_date,
date2index, date2num, num2date, utime)

# test cftime module for netCDF time <--> python datetime conversions.

Expand Down

0 comments on commit 0cf9051

Please sign in to comment.