From ff428cfda60df8949b73b36e8e1e0a7535dc52b8 Mon Sep 17 00:00:00 2001 From: Michael Gale Date: Tue, 18 Apr 2023 08:39:52 -0400 Subject: [PATCH] Fixed some issues with setup.py, new v.0.5.1 on pypy --- CHANGELOG.md | 2 +- cqkit/__init__.py | 2 +- environment.yml | 2 +- setup.py | 42 +++++++++++++++++++++--------------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 857c7ea..b6e0b6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,4 +4,4 @@ - v.0.3.1 - Added import_iges_file() - v.0.4.0 - PyPI packaging - v.0.5.0 - Update to support newer versions of CadQuery and OCP, minimum python 3.8+ -- +- v.0.5.1 - Update to fix setup.py issues diff --git a/cqkit/__init__.py b/cqkit/__init__.py index 89b40ff..56c0aa9 100644 --- a/cqkit/__init__.py +++ b/cqkit/__init__.py @@ -4,7 +4,7 @@ # fmt: off __project__ = 'cqkit' -__version__ = '0.5.0' +__version__ = '0.5.1' # fmt: on VERSION = __project__ + "-" + __version__ diff --git a/environment.yml b/environment.yml index 85e683d..cd6401e 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.8 + - python>=3.9 - ipython - numpy=1.23 - ocp>=7.6 diff --git a/setup.py b/setup.py index 2c9ca39..e0d5016 100644 --- a/setup.py +++ b/setup.py @@ -9,31 +9,31 @@ PACKAGE_NAME = "cqkit" -loc = os.path.abspath(os.path.dirname(__file__)) +# loc = os.path.abspath(os.path.dirname(__file__)) -with open(loc + "/requirements.txt") as f: - requirements = f.read().splitlines() +# 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) +# # 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"):