Install.sh

Alain Klotz
1 parent 9a84dd27
Showing 3 changed files with 18 additions and 15 deletions Show diff stats
install/install.sh
src/libtt/wrapper_libtt.cpp
src/libtt/wrapper_libtt.h
-#!/bin/bash
-
-# pyreverse
-echo "===== Requirements for pip"
-echo "pip3 install -r requirements.txt"
-pip3 install -r requirements.txt
-echo "pip3 install -r requirements_dev.txt"
-pip3 install -r requirements_dev.txt
-	
+#!/bin/bash
+
+echo "===== Requirements for pip"
+echo "pip3 install -r requirements.txt"
+pip-compile requirements.in
+pip3 install --user -r requirements.txt
+echo "pip3 install -r requirements_dev.txt"
+pip-compile requirements_dev.in
+pip3 install --user -r requirements_dev.txt
+	
+echo "===== Extension"
+cd ../src/libtt
+python3 setup.py build_ext --inplace --user
@@ -605,7 +605,6 @@ static PyObject* pimaseries(PyObject* self, PyObject* args) {
     nbkeys = (int)PyObject_Length(py_list_cards);
     printf("nbkeys=%d\n",nbkeys);
  
-    int v = 0;
 #if defined WITH_LIBTT    
     errcode = libtt_main(TT_PTR_ALLOKEYS,6,&nbkeys,&keynames,&values,&comments,&units,&datatypes);
 #endif
@@ -633,9 +632,9 @@ static PyObject* pimaseries(PyObject* self, PyObject* args) {
                 kcard++;
                 // assign keynames, comments, units
 #if defined WITH_LIBTT    
-                sprintf(keynames[kcard],keyname);
-                sprintf(comments[kcard],comment);
-                sprintf(units[kcard],"");
+                strcpy(keynames[kcard],keyname);
+                strcpy(comments[kcard],comment);
+                strcpy(units[kcard],"");
 #endif
                 // assign values, datatypes
                 if (PyBool_Check(py_val)) {
@@ -651,7 +650,7 @@ static PyObject* pimaseries(PyObject* self, PyObject* args) {
                     datatypes[kcard]=TINT;
 #endif
                     if (strcmp(keyname, "BITPIX")==0) { bitpix = val_int; }
-                } else if PyFloat_Check(py_val) {
+                } else if (PyFloat_Check(py_val)) {
 #if defined WITH_LIBTT    
                     sprintf(values[kcard],"%f",(float)PyFloat_AsDouble(py_val));
                     datatypes[kcard]=TFLOAT; 
@@ -37,7 +37,7 @@ char *char_type_pg(int type);
 void *calloc_pg(size_t nmemb, int type);
 void *copy_p_to_pg(void *p, size_t nelem, int p_type, bool force_pg);
 void *copy_pyarray_to_pg(PyArrayObject *py_array, size_t nelem, bool force_pg);
-#define PG_LOOP for (int k = 0 ; k < nelem ; k++)
+#define PG_LOOP for (int k = 0 ; k < (int)nelem ; k++)
 #define PG_MSG_ERR 512
  
 #define MSG 1024