Parcourir la source

Merge branch 'master' of https://lemma.codes/Lemma into master

master
Trevor Irons il y a 4 ans
Parent
révision
149a2e7e1d
5 fichiers modifiés avec 12 ajouts et 6 suppressions
  1. 2
    2
      CMake/SuperBuild.cmake
  2. 2
    0
      CMakeLists.txt
  3. 1
    0
      python/long.md
  4. 2
    2
      python/publish.sh
  5. 5
    2
      python/setup.py

+ 2
- 2
CMake/SuperBuild.cmake Voir le fichier

@@ -77,8 +77,8 @@ if (LEMMA_PYTHON3_BINDINGS)
77 77
         message( STATUS "pybind11 was found" )
78 78
     else()
79 79
         message( STATUS "pybind11 was NOT found, please build or remove LEMMA_PYTHON3_BINDINGS" )
80
-        find_package (Python COMPONENTS Interpreter Development)
81
-	    find_package(PythonLibs 3.0 REQUIRED)
80
+        #find_package(Python COMPONENTS Interpreter Development REQUIRED)
81
+	#find_package(PythonLibs 3.0 REQUIRED)
82 82
         ExternalProject_Add(pybind11
83 83
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
84 84
 		    GIT_TAG "v2.5.0" # "master" #"v2.4.3" #"master"

+ 2
- 0
CMakeLists.txt Voir le fichier

@@ -282,6 +282,8 @@ if (LEMMA_PYTHON3_BINDINGS)
282 282
     #include_directories(${PYTHON_INCLUDE_DIRS})
283 283
     #include_directories(${Boost_INCLUDE_DIRS})
284 284
     install ( FILES python/setup.py DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
285
+    install ( FILES python/long.md DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
286
+    install ( FILES python/publish.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
285 287
     install ( DIRECTORY python/pyLemma DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
286 288
 endif()
287 289
 

+ 1
- 0
python/long.md Voir le fichier

@@ -0,0 +1 @@
1
+Originally, Lemma is an Elecromagnetics modelling API. The scope of the project has expanded somewhat from this, and currently you can find documentation at https://lemmasoftware.org

+ 2
- 2
python/publish.sh Voir le fichier

@@ -2,8 +2,8 @@
2 2
 rm -rf build dist clean pyLemma.egg.info
3 3
 python setup.py build
4 4
 python setup.py bdist_wheel
5
-#auditwheel repair ./dist/pyLemma*.whl -w ./clean
6
-#twine upload build/* #clean/*
5
+auditwheel repair ./dist/pyLemma*.whl -w ./clean
6
+twine upload build/* #clean/*
7 7
 
8 8
 #rm -rf dist
9 9
 #python setup.py build

+ 5
- 2
python/setup.py Voir le fichier

@@ -19,13 +19,16 @@ class InstallPlatlib(install):
19 19
         if self.distribution.has_ext_modules():
20 20
             self.install_lib = self.install_platlib
21 21
 
22
+with open("README.md", "r") as fh:
23
+    long_description = fh.read()
24
+
22 25
 setup(
23 26
   name             = 'pyLemma',
24 27
   version          = '0.4.0', 
25 28
   author           = 'Trevor Irons and others',
26 29
   author_email     = 'Trevor.Irons@lemmasoftware.org',
27
-  description      = 'A short description of the app/lib',
28
-  long_description = 'A longer one',
30
+  description      = 'PyLemma is a wrapper to Lemma',
31
+  long_description = long_description,
29 32
   classifiers=[
30 33
         'Development Status :: 3 - Alpha',
31 34
         'Intended Audience :: Developers',

Chargement…
Annuler
Enregistrer