From 1e4e274b554dabc4471656bfda51b06847b4b133 Mon Sep 17 00:00:00 2001 From: Sofus Rose Date: Thu, 26 Jan 2017 17:35:19 -0500 Subject: [PATCH] Updated requirements.txt --- .gitlab-ci.yml | 1 + requirements.txt | 12 +++++++----- setup.py | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb81903..97f9489 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ build: stage: build before_script: - apt-get update && apt-get -y install python3-pip gcc libmagickwand-dev + - pip3 install -r requirements.txt script: - python3 setup.py sdist #Build source distribution. - python3 setup.py bdist_wheel #Build Linux wheel. diff --git a/requirements.txt b/requirements.txt index 7400b0a..b268c43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ -numpy==1.12.0 -pygame==1.9.3 -PyOpenGL==3.1.0 -scipy==0.18.1 -Wand==0.4.4 +numpy +pygame +PyOpenGL +scipy +Wand +setuptools +pybind11 diff --git a/setup.py b/setup.py index 1e17cc9..f0d6341 100755 --- a/setup.py +++ b/setup.py @@ -13,6 +13,8 @@ import pybind11 def read(fname): return open(join(path.dirname(__file__), fname)).read() + +pypi_deps = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools', 'pybind11'] #Make sure we're using gcc. os.environ["CC"] = "g++" @@ -46,7 +48,7 @@ setup( name = 'openlut', keywords = ['color', 'image', 'images', 'processing'], - install_requires = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools', 'pybind11'], + install_requires = pypi_deps, classifiers = [ 'Development Status :: 3 - Alpha',