Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
---------

Release 5.0.8
"""""""""""""

* fixing/test for a regression introduced in 5.0.7 that prevented ``import validate`` from working


Release 5.0.7
"""""""""""""

Expand Down
6 changes: 6 additions & 0 deletions docs/configobj.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2383,6 +2383,12 @@ CHANGELOG
This is an abbreviated changelog showing the major releases up to version 4.
From version 4 it lists all releases and changes.

2023/01/18 - Version 5.0.8
--------------------------

* fixing/test for a regression introduced in 5.0.7 that prevented ``import validate`` from working


2023/01/17 - Version 5.0.7
--------------------------

Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#

[egg_info]
tag_build = .dev0
#tag_build = .dev0
tag_date = false


[sdist]
formats = zip, gztar
formats = gztar


[bdist_wheel]
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

NAME = 'configobj'
MODULES = []
PACKAGES = ['configobj']
PACKAGES = ['configobj', 'validate']
DESCRIPTION = 'Config file reading, writing and validation.'
URL = 'https://github.com/DiffSK/configobj'

Expand Down Expand Up @@ -105,7 +105,7 @@

AUTHOR = 'Rob Dennis, Eli Courtwright (Michael Foord & Nicola Larosa original maintainers)'

AUTHOR_EMAIL = '[email protected], [email protected], [email protected], [email protected]'
AUTHOR_EMAIL = '[email protected], [email protected], [email protected], [email protected]'

KEYWORDS = "config, ini, dictionary, application, admin, sysadmin, configuration, validation".split(', ')

Expand All @@ -121,7 +121,7 @@
package_dir={'': 'src'},
packages=PACKAGES,
install_requires=[i.strip() for i in REQUIRES.splitlines() if i.strip()],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
classifiers=CLASSIFIERS,
keywords=KEYWORDS,
license='BSD (2 clause)',
Expand Down
2 changes: 1 addition & 1 deletion src/configobj/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '5.0.7'
__version__ = '5.0.8'
1 change: 0 additions & 1 deletion src/configobj/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
'is_ip_addr_list',
'is_mixed_list',
'is_option',
'__docformat__',
)


Expand Down
14 changes: 14 additions & 0 deletions src/tests/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@
from configobj.validate import Validator, VdtValueTooSmallError


class TestImporting(object):
def test_top_level(self, val):
import validate
assert val.__class__ is validate.Validator

def test_within_configobj_using_from(self, val):
from configobj import validate
assert val.__class__ is validate.Validator

def test_within_configobj(self, val):
import configobj.validate
assert val.__class__ is configobj.validate.Validator


class TestBasic(object):
def test_values_too_small(self, val):
config = '''
Expand Down
22 changes: 22 additions & 0 deletions src/validate/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
"""
This is a backwards compatibility-shim to support:

```
import validate
```

in a future release, we'd expect this to no longer work and
instead using:

```
import configobj.validate
```

or:

```
from configobj import validate
```
"""
from configobj.validate import *