Skip to content

Commit

Permalink
Fixed some issues with setup.py, new v.0.5.1 on pypy
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelgale committed Apr 18, 2023
1 parent 8b6c171 commit ff428cf
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cqkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# fmt: off
__project__ = 'cqkit'
__version__ = '0.5.0'
__version__ = '0.5.1'
# fmt: on

VERSION = __project__ + "-" + __version__
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python>=3.8
- python>=3.9
- ipython
- numpy=1.23
- ocp>=7.6
Expand Down
42 changes: 21 additions & 21 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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://[email protected]/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://[email protected]/xxxxx/xxxxxx#egg=package_name")
# else:
# required.append(line)


def read_package_variable(key, filename="__init__.py"):
Expand Down

0 comments on commit ff428cf

Please sign in to comment.