From 59668d2910d203e570a7361f312fbbb130d79cf8 Mon Sep 17 00:00:00 2001 From: Daniel Otto de Mentock Date: Mon, 25 Apr 2022 14:58:15 +0200 Subject: [PATCH] removed zip_safe = false entry from setup.cfg --- .gitlab-ci.yml | 2 +- python/setup.cfg | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89c22a2f8..07bad3a12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -234,7 +234,7 @@ update_revision: - git clone -q git@git.damask.mpie.de:damask/DAMASK.git . - git pull - VERSION=$(git describe ${CI_COMMIT_SHA}) - - export VERSION="${VERSION:1:-1}" + - export VERSION="${VERSION:1}" - echo ${VERSION} > python/damask/VERSION - > git diff-index --quiet HEAD || diff --git a/python/setup.cfg b/python/setup.cfg index 89a3cacf5..30107fd10 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -16,16 +16,15 @@ classifiers = [options] packages = damask -zip_safe = false include_package_data = true python_requires = >= 3.8 install_requires = importlib-metadata; python_version<"3.8" - pandas; python_version<="0.24" # requires numpy - numpy; python_version<="1.17" # needed for default_rng + pandas; python_version<="0.24" # requires numpy + numpy; python_version<="1.17" # needed for default_rng scipy; python_version<="1.2" - h5py; python_version<="2.9" # requires numpy + h5py; python_version<="2.9" # requires numpy vtk; python_version<="8.1" - matplotlib; python_version<="3.0" # requires numpy, pillow + matplotlib; python_version<="3.0" # requires numpy, pillow pyyaml; python_version<="3.12" setup_requires = setuptools