diff --git a/README.md b/README.md index 26f705e..931175f 100644 --- a/README.md +++ b/README.md @@ -418,6 +418,7 @@ es = SharedVerticesWithObjectSelector(face1) - v.0.4.0 - First release on PyPI - v.0.5.0 - Update requires python v.3.8+ and OCP v.7.6+ CadQuery 2.1+ +- v.0.5.3 - Updated with new helpers and updated setup.py ## Authors diff --git a/cqkit/__init__.py b/cqkit/__init__.py index 3158cb0..c0ce463 100644 --- a/cqkit/__init__.py +++ b/cqkit/__init__.py @@ -4,7 +4,7 @@ # fmt: off __project__ = 'cqkit' -__version__ = '0.5.2' +__version__ = '0.5.3' # fmt: on VERSION = __project__ + "-" + __version__ diff --git a/setup.py b/setup.py index e0d5016..cca0314 100644 --- a/setup.py +++ b/setup.py @@ -3,37 +3,15 @@ import os import os.path +from pathlib import Path import sys import setuptools PACKAGE_NAME = "cqkit" -# loc = os.path.abspath(os.path.dirname(__file__)) - -# with open(loc + "/requirements.txt") as f: -# requirements = f.read().splitlines() - required = [] dependency_links = [] -# # do not add to required lines pointing to git repositories -# EGG_MARK = "#egg=" -# for line in requirements: -# if ( -# line.startswith("-e git:") -# or line.startswith("-e git+") -# or line.startswith("git:") -# or line.startswith("git+") -# ): -# if EGG_MARK in line: -# package_name = line[line.find(EGG_MARK) + len(EGG_MARK) :] -# required.append(package_name) -# dependency_links.append(line) -# else: -# print("Dependency to a git repository should have the format:") -# print("git+ssh://git@github.com/xxxxx/xxxxxx#egg=package_name") -# else: -# required.append(line) def read_package_variable(key, filename="__init__.py"): @@ -47,15 +25,8 @@ def read_package_variable(key, filename="__init__.py"): sys.exit("'{0}' not found in '{1}'".format(key, module_path)) -def build_description(): - """Build a description for the project from documentation files.""" - try: - readme = open("README.md").read() - changelog = open("CHANGELOG.md").read() - except IOError: - return "" - else: - return readme + "\n" + changelog +this_directory = Path(__file__).parent +long_description = (this_directory / "README.md").read_text() setuptools.setup( @@ -65,9 +36,9 @@ def build_description(): url="https://github.com/michaelgale/cq-kit", author="Michael Gale", author_email="michael@fxbricks.com", - python_requires=">=3.8", + python_requires=">=3.9", packages=setuptools.find_packages(), - long_description=build_description(), + long_description=long_description, long_description_content_type="text/markdown", license="MIT", classifiers=[