Skip to content

Commit

Permalink
Attempt to fix setuptools with git requirement, version 0.80.1
Browse files Browse the repository at this point in the history
  • Loading branch information
M3te0r committed Apr 28, 2022
1 parent 6f5458c commit 943973a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
version = '0.78'
version = '0.80'
# The full version, including alpha/beta/rc tags.
release = '0.78.0'
release = '0.80.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
10 changes: 6 additions & 4 deletions itools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
# Import from standard lib
from logging import getLogger, NullHandler

# Import from itools
from .core import get_version

getLogger("itools.core").addHandler(NullHandler())
getLogger("itools.web").addHandler(NullHandler())
getLogger("itools.database").addHandler(NullHandler())
getLogger("itools.stl").addHandler(NullHandler())
getLogger("itools.catalog").addHandler(NullHandler())

__version__ = get_version()
# The version
__version__ = "0.80.1"
__version_info__ = tuple(
int(num) if num.isdigit() else num
for num in __version__.replace("-", ".", 1).split(".")
)
2 changes: 1 addition & 1 deletion itools/pkg/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def setup(path, ext_modules=None):
if exists('requirements.txt'):
install_requires = parse_requirements(
'requirements.txt', session='xxx')
install_requires = [str(ir.requirement) for ir in install_requires]
install_requires = [str(ir.requirement) for ir in install_requires if not str(ir.requirement).startswith("git")]
# XXX Workaround buggy distutils ("sdist" don't likes unicode strings,
# and "register" don't likes normal strings).
if 'register' in argv:
Expand Down
3 changes: 2 additions & 1 deletion setup.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ url = "http://www.hforge.org/itools"
author_name = "J. David Ibáñez"
author_email = "[email protected]"
license = "GNU General Public License (GPL)"
version=0.80.1

# Longer Description
description = "
Expand Down Expand Up @@ -42,7 +43,7 @@ packages = "core csv database database/backends datatypes fs gettext handlers ht
requires = ""

# Provides
provides = "itools(0.78.0)"
provides = "itools(0.80.1)"

# Scripts
scripts = "idb-inspect.py igettext-build.py igettext-extract.py
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def generate_mo_files(po_file_names):
else:
package_data['itools'].append(join_path(*path[1:]))
setup(name="itools",
version="0.78.0",
version="0.80.1",
# Metadata
author="J. David Ibáñez",
author_email="[email protected]" ,
Expand Down

0 comments on commit 943973a

Please sign in to comment.