From 53f6a4e030aa4ea9ba880895708a1f59d3254e91 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 06:00:56 +0200 Subject: [PATCH 01/11] too specific - only works at MPIE --- python/damask/environment.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/python/damask/environment.py b/python/damask/environment.py index 17786ab28..0b77c94d2 100644 --- a/python/damask/environment.py +++ b/python/damask/environment.py @@ -26,24 +26,3 @@ class Environment(): if len(items) == 2: self.options[items[0].upper()] = \ re.sub('\$\{*DAMASK_ROOT\}*',self.rootDir(),os.path.expandvars(items[1])) # expand all shell variables and DAMASK_ROOT - - def isAvailable(self,software,Nneeded =-1): - licensesNeeded = {'abaqus' :5, - 'standard':5 - } - if Nneeded == -1: Nneeded = licensesNeeded[software] - try: - cmd = """ ssh mulicense2 "/lm-status | grep 'Users of %s: ' | cut -d' ' -f7,13" """%software - process = subprocess.Popen(shlex.split(cmd),stdout = subprocess.PIPE,stderr = subprocess.PIPE) - licenses = list(map(int, process.stdout.readline().split())) - try: - if licenses[0]-licenses[1] >= Nneeded: - return 0 - else: - print('%s missing licenses for %s'%(licenses[1] + Nneeded - licenses[0],software)) - return licenses[1] + Nneeded - licenses[0] - except IndexError: - print('Could not retrieve license information for %s'%software) - return 127 - except: - return 126 From 7104bc9934730d8eac42bafedc1fc5f1ca519d4a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 07:08:32 +0200 Subject: [PATCH 02/11] allow standard CMAKE way of setting install directory - DAMASK_BIN in config has no effect anymore --- CMakeLists.txt | 24 ++++-------------------- Makefile | 5 +++-- PRIVATE | 2 +- src/CMakeLists.txt | 4 ++-- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cfe47248..a76b7ae3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,11 +106,11 @@ set (CMAKE_C_COMPILER "${PETSC_MPICC}") # DAMASK solver defines project to build if (DAMASK_SOLVER STREQUAL "GRID") - project (DAMASK_grid Fortran C) + project (damask-grid Fortran C) add_definitions (-DGrid) message ("Building Grid Solver\n") elseif (DAMASK_SOLVER STREQUAL "FEM") - project (DAMASK_FEM Fortran C) + project (damask-mesh Fortran C) add_definitions (-DFEM) message ("Building FEM Solver\n") else () @@ -156,22 +156,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") set (BUILDCMD_POST "${BUILDCMD_POST} -fsyntax-only") endif () -# Parse DAMASK_BIN from CONFIG file -file (READ "CONFIG" CONFIGFILE) -string (REGEX REPLACE ";" "\\\\;" CONFIGFILE "${CONFIGFILE}") -string (REGEX REPLACE "\n" ";" CONFIGFILE "${CONFIGFILE}") -foreach (item ${CONFIGFILE}) - string (REGEX MATCH ".+DAMASK_BIN.+" item ${item}) - if (item) - string (REGEX REPLACE "set" "" item "${item}") - string (REGEX REPLACE "=" " " item "${item}") - string (REGEX REPLACE "\\\${DAMASK_ROOT}" "${PROJECT_SOURCE_DIR}" item "${item}") - string (REPLACE "DAMASK_BIN" ";" STRING_LIST ${item}) - list (GET STRING_LIST 1 item) - string (STRIP "${item}" CMAKE_INSTALL_PREFIX) - endif () -endforeach(item ${CONFIGFILE}) - # Parse DAMASK version from VERSION file find_program (CAT_EXECUTABLE NAMES cat) execute_process (COMMAND ${CAT_EXECUTABLE} ${PROJECT_SOURCE_DIR}/VERSION @@ -490,10 +474,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole) install (PROGRAMS ${nothing} DESTINATION ${black_hole}) else () - if (PROJECT_NAME STREQUAL "DAMASK_grid") + if (PROJECT_NAME STREQUAL "damask-grid") install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_spectral DESTINATION ${CMAKE_INSTALL_PREFIX}) - elseif (PROJECT_NAME STREQUAL "DAMASK_FEM") + elseif (PROJECT_NAME STREQUAL "damask-mesh") install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_FEM DESTINATION ${CMAKE_INSTALL_PREFIX}) endif () diff --git a/Makefile b/Makefile index 53ae30c1c..31553d88f 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ SHELL = /bin/sh ######################################################################################## # Makefile for the installation of DAMASK ######################################################################################## +DAMASK_ROOT = $(shell python -c "import os,sys; print(os.path.normpath(os.path.realpath(os.path.expanduser('$(pwd)'))))") .PHONY: all all: grid FEM processing @@ -20,12 +21,12 @@ FEM: build/FEM .PHONY: build/grid build/grid: @mkdir -p build/grid - @(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) + @(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}/bin -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) .PHONY: build/FEM build/FEM: @mkdir -p build/FEM - @(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) + @(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}/bin -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) .PHONY: clean clean: diff --git a/PRIVATE b/PRIVATE index f342bc7da..f6171a748 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f342bc7dabddf5a9c7786d14115145ef4b0f330b +Subproject commit f6171a748e51b994db27c2cc74cc0168b7aea93f diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 274069226..8cdb51551 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ list(FILTER sources EXCLUDE REGEX ".*mesh_abaqus.*\\.f90") list(FILTER sources EXCLUDE REGEX ".*commercialFEM_fileList.*\\.f90") -if (PROJECT_NAME STREQUAL "DAMASK_grid") +if (PROJECT_NAME STREQUAL "damask-grid") # probably we should have subfolders for FEM and spectral list(FILTER sources EXCLUDE REGEX ".*DAMASK_FEM.*\\.f90") @@ -29,7 +29,7 @@ if (PROJECT_NAME STREQUAL "DAMASK_grid") add_library(DAMASK_spectral OBJECT ${sources}) endif() -elseif (PROJECT_NAME STREQUAL "DAMASK_FEM") +elseif (PROJECT_NAME STREQUAL "damask-mesh") # probably we should have subfolders for FEM and spectral list(FILTER sources EXCLUDE REGEX ".*DAMASK_grid.*\\.f90") From 64c9a367c0304212a917a489793310b3ed01d62a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 07:16:24 +0200 Subject: [PATCH 03/11] always install post processing scripts into {$DAMASK_ROOT}/bin custom installation directions will be made available by more standard approaches --- CONFIG | 2 -- installation/symlink_Processing.py | 2 +- python/damask/environment.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CONFIG b/CONFIG index 31a9c34c8..6d5226c89 100644 --- a/CONFIG +++ b/CONFIG @@ -1,8 +1,6 @@ # "set"-syntax needed only for tcsh (but works with bash and zsh) # DAMASK_ROOT will be expanded -set DAMASK_BIN = ${DAMASK_ROOT}/bin - set DAMASK_NUM_THREADS = 4 set MSC_ROOT = /opt/msc diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py index 60f8d3639..90497c0eb 100755 --- a/installation/symlink_Processing.py +++ b/installation/symlink_Processing.py @@ -7,7 +7,7 @@ import damask damaskEnv = damask.Environment() baseDir = damaskEnv.relPath('processing/') -binDir = damaskEnv.options['DAMASK_BIN'] +binDir = damaskEnv.relPath('bin/') if not os.path.isdir(binDir): os.mkdir(binDir) diff --git a/python/damask/environment.py b/python/damask/environment.py index 0b77c94d2..21eb24694 100644 --- a/python/damask/environment.py +++ b/python/damask/environment.py @@ -1,6 +1,6 @@ # -*- coding: UTF-8 no BOM -*- -import os,subprocess,shlex,re +import os,re class Environment(): __slots__ = [ \ From eab2ce376186d2f846b33b275e4e0f12624012b8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 08:00:09 +0200 Subject: [PATCH 04/11] point always to $DAMASK_ROOT/bin --- env/DAMASK.csh | 4 +--- env/DAMASK.sh | 3 +-- env/DAMASK.zsh | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/env/DAMASK.csh b/env/DAMASK.csh index 1819dd305..d223d885a 100644 --- a/env/DAMASK.csh +++ b/env/DAMASK.csh @@ -13,9 +13,7 @@ set BRANCH = `git branch 2>/dev/null| grep -E '^\* ')` cd - >/dev/null # if DAMASK_BIN is present -if ( $?DAMASK_BIN) then - set path = ($DAMASK_BIN $path) -endif +set path = ($DAMASK_ROOT/bin $path) set SOLVER=`which DAMASK_spectral` set PROCESSING=`which postResults` diff --git a/env/DAMASK.sh b/env/DAMASK.sh index fa2c8db25..1b4bea86a 100644 --- a/env/DAMASK.sh +++ b/env/DAMASK.sh @@ -33,8 +33,7 @@ unset -f set # add BRANCH if DAMASK_ROOT is a git repository cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null -# add DAMASK_BIN if present -[ "x$DAMASK_BIN" != "x" ] && PATH=$DAMASK_BIN:$PATH +PATH=${DAMASK_ROOT}/bin:$PATH SOLVER=$(type -p DAMASK_spectral || true 2>/dev/null) [ "x$SOLVER" == "x" ] && SOLVER=$(blink 'Not found!') diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index 61b9c89f9..5449007f9 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -25,7 +25,7 @@ unset -f set cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null # add DAMASK_BIN if present -[[ "x$DAMASK_BIN" != "x" ]] && PATH=$DAMASK_BIN:$PATH +PATH=${DAMASK_ROOT}/bin:$PATH SOLVER=$(which DAMASK_spectral || true 2>/dev/null) [[ "x$SOLVER" == "x" ]] && SOLVER=$(blink 'Not found!') From 009a47ad7255f54dd8d7fd0bf719b83930ad53d2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 25 Apr 2019 20:02:48 +0200 Subject: [PATCH 05/11] make python package independent from rest of DAMASK https://packaging.python.org/guides/single-sourcing-package-version/ --- python/damask/VERSION | 1 + python/damask/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 python/damask/VERSION diff --git a/python/damask/VERSION b/python/damask/VERSION new file mode 120000 index 000000000..558194c5a --- /dev/null +++ b/python/damask/VERSION @@ -0,0 +1 @@ +../../VERSION \ No newline at end of file diff --git a/python/damask/__init__.py b/python/damask/__init__.py index d7ed4a9f9..a57d450d8 100644 --- a/python/damask/__init__.py +++ b/python/damask/__init__.py @@ -3,8 +3,8 @@ """Main aggregator""" import os -with open(os.path.join(os.path.dirname(__file__),'../../VERSION')) as f: - version = f.readline()[:-1] +with open(os.path.join(os.path.dirname(__file__),'VERSION')) as f: + version = f.readline()[1:-1] name = 'damask' From 5020d8204e3c503435d58b4eee9068586bc4b87a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 10:00:29 +0200 Subject: [PATCH 06/11] prefix is without bin --- CMakeLists.txt | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a76b7ae3d..9f808b167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -476,9 +476,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") else () if (PROJECT_NAME STREQUAL "damask-grid") install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_spectral - DESTINATION ${CMAKE_INSTALL_PREFIX}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) elseif (PROJECT_NAME STREQUAL "damask-mesh") install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_FEM - DESTINATION ${CMAKE_INSTALL_PREFIX}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) endif () endif () diff --git a/Makefile b/Makefile index 31553d88f..161d4c3ce 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,12 @@ FEM: build/FEM .PHONY: build/grid build/grid: @mkdir -p build/grid - @(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}/bin -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) + @(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) .PHONY: build/FEM build/FEM: @mkdir -p build/FEM - @(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}/bin -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) + @(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;) .PHONY: clean clean: From ed2d64d87624a9ec85e1411cb9772cdcaffc2279 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 16:36:36 +0200 Subject: [PATCH 07/11] more standard way of installing executable --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f808b167..4601d0dfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -474,11 +474,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole) install (PROGRAMS ${nothing} DESTINATION ${black_hole}) else () + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) if (PROJECT_NAME STREQUAL "damask-grid") - install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_spectral - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install (TARGETS DAMASK_spectral RUNTIME) elseif (PROJECT_NAME STREQUAL "damask-mesh") - install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_FEM - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install (TARGETS DAMASK_FEM RUNTIME) endif () endif () From b63a6c703436a3fa810bf90dc96e69f52cc7b2a9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 17:39:21 +0200 Subject: [PATCH 08/11] cleaner code that also works with older cmake --- CMakeLists.txt | 15 +-------------- src/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4601d0dfd..a9c5fa83e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -467,17 +467,4 @@ message ("Fortran Linker Command:\n${CMAKE_Fortran_LINK_EXECUTABLE}\n") # location of code add_subdirectory (src) - -# INSTALL BUILT BINARIES -if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") - exec_program (mktemp OUTPUT_VARIABLE nothing) - exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole) - install (PROGRAMS ${nothing} DESTINATION ${black_hole}) -else () - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - if (PROJECT_NAME STREQUAL "damask-grid") - install (TARGETS DAMASK_spectral RUNTIME) - elseif (PROJECT_NAME STREQUAL "damask-mesh") - install (TARGETS DAMASK_FEM RUNTIME) - endif () -endif () +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cdb51551..6ff120873 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,8 +25,12 @@ if (PROJECT_NAME STREQUAL "damask-grid") if(NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") add_executable(DAMASK_spectral ${sources}) + install (TARGETS DAMASK_spectral RUNTIME) else() add_library(DAMASK_spectral OBJECT ${sources}) + exec_program (mktemp OUTPUT_VARIABLE nothing) + exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole) + install (PROGRAMS ${nothing} DESTINATION ${black_hole}) endif() elseif (PROJECT_NAME STREQUAL "damask-mesh") @@ -42,5 +46,6 @@ elseif (PROJECT_NAME STREQUAL "damask-mesh") list(FILTER sources EXCLUDE REGEX ".*mesh_grid.*\\.f90") add_executable(DAMASK_FEM ${sources}) + install (TARGETS DAMASK_FEM RUNTIME) endif() From b4a21e8d40651e7186e117066e697f5dc66c2861 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 18:07:43 +0200 Subject: [PATCH 09/11] fix for older cmake looks ok --- CMakeLists.txt | 1 - src/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9c5fa83e..78d63117e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -467,4 +467,3 @@ message ("Fortran Linker Command:\n${CMAKE_Fortran_LINK_EXECUTABLE}\n") # location of code add_subdirectory (src) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ff120873..736db112a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ if (PROJECT_NAME STREQUAL "damask-grid") if(NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") add_executable(DAMASK_spectral ${sources}) - install (TARGETS DAMASK_spectral RUNTIME) + install (TARGETS DAMASK_spectral RUNTIME DESTINATION bin) else() add_library(DAMASK_spectral OBJECT ${sources}) exec_program (mktemp OUTPUT_VARIABLE nothing) @@ -46,6 +46,6 @@ elseif (PROJECT_NAME STREQUAL "damask-mesh") list(FILTER sources EXCLUDE REGEX ".*mesh_grid.*\\.f90") add_executable(DAMASK_FEM ${sources}) - install (TARGETS DAMASK_FEM RUNTIME) + install (TARGETS DAMASK_FEM RUNTIME DESTINATION bin) endif() From 1b9355327a49186103d92114bd202a6944ddf73b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 19:08:10 +0200 Subject: [PATCH 10/11] WIP: preparing for PIP package --- python/damask/LICENSE | 1 + python/damask/setup.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 120000 python/damask/LICENSE create mode 100644 python/damask/setup.py diff --git a/python/damask/LICENSE b/python/damask/LICENSE new file mode 120000 index 000000000..30cff7403 --- /dev/null +++ b/python/damask/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/python/damask/setup.py b/python/damask/setup.py new file mode 100644 index 000000000..f44738d38 --- /dev/null +++ b/python/damask/setup.py @@ -0,0 +1,18 @@ +import setuptools + +setuptools.setup( + name="xxx", + version="0.0.1", + author="The DAMASK team", + author_email="damask@mpie.de", + description="A small example package", + long_description='test', + long_description_content_type="text/markdown", + url="https://github.com/pypa/sampleproject", + packages=setuptools.find_packages(), + classifiers=[ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: GLPv3", + "Operating System :: OS Independent", + ], +) From 1ccc9675448f5097a8ea5a5fa9291d22c6d8886c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Apr 2019 19:24:22 +0200 Subject: [PATCH 11/11] enables auto include --- python/.gitignore | 1 + python/{damask => }/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 python/.gitignore rename python/{damask => }/setup.py (87%) diff --git a/python/.gitignore b/python/.gitignore new file mode 100644 index 000000000..1521c8b76 --- /dev/null +++ b/python/.gitignore @@ -0,0 +1 @@ +dist diff --git a/python/damask/setup.py b/python/setup.py similarity index 87% rename from python/damask/setup.py rename to python/setup.py index f44738d38..823365d34 100644 --- a/python/damask/setup.py +++ b/python/setup.py @@ -1,11 +1,11 @@ import setuptools setuptools.setup( - name="xxx", + name="damask", version="0.0.1", author="The DAMASK team", author_email="damask@mpie.de", - description="A small example package", + description="Python library for DAMASK", long_description='test', long_description_content_type="text/markdown", url="https://github.com/pypa/sampleproject",