Browse Source

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

master
Trevor Irons 4 years ago
parent
commit
149a2e7e1d
5 changed files with 12 additions and 6 deletions
  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 View File

77
         message( STATUS "pybind11 was found" )
77
         message( STATUS "pybind11 was found" )
78
     else()
78
     else()
79
         message( STATUS "pybind11 was NOT found, please build or remove LEMMA_PYTHON3_BINDINGS" )
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
         ExternalProject_Add(pybind11
82
         ExternalProject_Add(pybind11
83
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
83
 		    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
84
 		    GIT_TAG "v2.5.0" # "master" #"v2.4.3" #"master"
84
 		    GIT_TAG "v2.5.0" # "master" #"v2.4.3" #"master"

+ 2
- 0
CMakeLists.txt View File

282
     #include_directories(${PYTHON_INCLUDE_DIRS})
282
     #include_directories(${PYTHON_INCLUDE_DIRS})
283
     #include_directories(${Boost_INCLUDE_DIRS})
283
     #include_directories(${Boost_INCLUDE_DIRS})
284
     install ( FILES python/setup.py DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
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
     install ( DIRECTORY python/pyLemma DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
287
     install ( DIRECTORY python/pyLemma DESTINATION ${CMAKE_INSTALL_PREFIX}/pyLemma/ ) 
286
 endif()
288
 endif()
287
 
289
 

+ 1
- 0
python/long.md View File

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 View File

2
 rm -rf build dist clean pyLemma.egg.info
2
 rm -rf build dist clean pyLemma.egg.info
3
 python setup.py build
3
 python setup.py build
4
 python setup.py bdist_wheel
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
 #rm -rf dist
8
 #rm -rf dist
9
 #python setup.py build
9
 #python setup.py build

+ 5
- 2
python/setup.py View File

19
         if self.distribution.has_ext_modules():
19
         if self.distribution.has_ext_modules():
20
             self.install_lib = self.install_platlib
20
             self.install_lib = self.install_platlib
21
 
21
 
22
+with open("README.md", "r") as fh:
23
+    long_description = fh.read()
24
+
22
 setup(
25
 setup(
23
   name             = 'pyLemma',
26
   name             = 'pyLemma',
24
   version          = '0.4.0', 
27
   version          = '0.4.0', 
25
   author           = 'Trevor Irons and others',
28
   author           = 'Trevor Irons and others',
26
   author_email     = 'Trevor.Irons@lemmasoftware.org',
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
   classifiers=[
32
   classifiers=[
30
         'Development Status :: 3 - Alpha',
33
         'Development Status :: 3 - Alpha',
31
         'Intended Audience :: Developers',
34
         'Intended Audience :: Developers',

Loading…
Cancel
Save