Skip to content

Commit

Permalink
Fix for black
Browse files Browse the repository at this point in the history
  • Loading branch information
kotarot committed Oct 16, 2020
1 parent bf752ca commit 4ee6d0b
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
6 changes: 3 additions & 3 deletions sample/sample.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import sawatabi

def main():
print('version:', sawatabi.version())
print('version_info:', sawatabi.version_info())
print("version:", sawatabi.version())
print("version_info:", sawatabi.version_info())

if __name__ == '__main__':
if __name__ == "__main__":
main()
4 changes: 2 additions & 2 deletions sawatabi/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '0.0.1.dev2'
__version_info__ = tuple(int(i) if i.isdigit() else i for i in __version__.split('.'))
__version__ = "0.0.1.dev2"
__version_info__ = tuple(int(i) if i.isdigit() else i for i in __version__.split("."))
2 changes: 2 additions & 0 deletions sawatabi/utils/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

from ..__version__ import __version__, __version_info__


def version():
return __version__


def version_info():
return __version_info__
48 changes: 24 additions & 24 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,49 @@
import re
from setuptools import setup

package_name = 'sawatabi'
package_name = "sawatabi"
packages = [
package_name,
package_name + '.utils',
package_name + ".utils",
]

root_dir = path.abspath(path.dirname(__file__))

with open(path.join(root_dir, package_name, '__version__.py'), encoding='utf8') as f:
version = re.search(r'__version__\s*=\s*[\'\"](.+?)[\'\"]', f.read()).group(1)
with open(path.join(root_dir, package_name, "__version__.py"), encoding="utf8") as f:
version = re.search(r"__version__\s*=\s*[\'\"](.+?)[\'\"]", f.read()).group(1)

with open(path.join(root_dir, 'README.md'), encoding='utf-8') as f:
with open(path.join(root_dir, "README.md"), encoding="utf-8") as f:
long_description = f.read()

setup(
name=package_name,
packages=packages,
version=version,
license='Apache 2.0',
license="Apache 2.0",
install_requires=[
'pyqubo>=0.4.0,<1.0.0',
'dwave-neal>=0.5.6,<1.0.0',
'apache-beam>=2.24.0,<3.0.0',
"pyqubo>=0.4.0,<1.0.0",
"dwave-neal>=0.5.6,<1.0.0",
"apache-beam>=2.24.0,<3.0.0",
],
extras_require={
'dev': [
'pytest>=6.1.1,<7.0.0',
'pytest-cov>=2.10.1,<3.0.0',
'black>=20.8b1,<21.0',
'flake8>=3.8.4,<4.0.0',
'isort>=5.6.4,<6.0.0',
"dev": [
"pytest>=6.1.1,<7.0.0",
"pytest-cov>=2.10.1,<3.0.0",
"black>=20.8b1,<21.0",
"flake8>=3.8.4,<4.0.0",
"isort>=5.6.4,<6.0.0",
],
},
author='Kotaro Terada, Shingo Furuyama, Junya Usui, and Kazuki Ono',
author_email='kotarot@apache.org',
url='https://github.com/kotarot/sawatabi',
description='sawatabi.',
author="Kotaro Terada, Shingo Furuyama, Junya Usui, and Kazuki Ono",
author_email="kotarot@apache.org",
url="https://github.com/kotarot/sawatabi",
description="sawatabi.",
long_description=long_description,
long_description_content_type='text/markdown',
keywords='',
long_description_content_type="text/markdown",
keywords="",
classifiers=[
'Development Status :: 1 - Planning',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3.8',
"Development Status :: 1 - Planning",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3.8",
],
)
4 changes: 3 additions & 1 deletion tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

from sawatabi import version, version_info


def test_version_format():
assert re.match(r'^\d+.\d+.\d+(.(dev|a|b|rc)\d+)?$', version())
assert re.match(r"^\d+.\d+.\d+(.(dev|a|b|rc)\d+)?$", version())


def test_version_info_format():
ver_info = version_info()
Expand Down

0 comments on commit 4ee6d0b

Please sign in to comment.