Commit 5b4fc682 authored by VIGNET Pierre's avatar VIGNET Pierre

Add forgotten (?) README; Fix wheel & source packages upload; Update README...

Add forgotten (?) README; Fix wheel & source packages upload; Update README with uploaded pypi packages
parent 080e6a31
......@@ -88,7 +88,9 @@ The location of this script may vary depending on your Linux distro
Cadbiom software requires a SAT solver which is
proposed as a Python wrapper by an independant library (pycryptosat).
*For now, pycryptosat is not on pypi; so we use a fork from
*For now, an non official version of pycryptosat is on pypi and it is used by packages;
Source of the fork if you want to compile it manually:
[Cryptominisat repository](https://github.com/msoos/cryptominisat/tree/5.0.1)*
Here you will find the installation commands of the pycryptosat package:
......@@ -101,6 +103,12 @@ Here you will find the installation commands of the pycryptosat package:
### Cadbiom
If you want to install from pypi, just do:
pip install cadbiom-cmd
pip install cadbiom-gui
If you want to install the library with its GUI, and command line in one command,
after the git clone step, just do:
......
......@@ -37,6 +37,6 @@ unit_tests:
@echo Launch unit tests
python2.7 setup.py test
upload:
python2.7 setup.py sdist
upload: clean sdist
python setup.py bdist_wheel
twine upload dist/* -r pypi_inria
......@@ -31,7 +31,7 @@ from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand
from sys import version_info
__PACKAGE_VERSION__ = "0.1.0"
__PACKAGE_VERSION__ = "0.1.1"
__LIBRARY_VERSION__ = "0.1.0"
deps = []
......@@ -60,7 +60,7 @@ setup(
# Library name & version
name='cadbiom_cmd',
version=__LIBRARY_VERSION__,
version=__PACKAGE_VERSION__,
# Search all packages recursively
packages=find_packages(),
......
include README.md
recursive-include cadbiom_gui/gt_gui/chart_glade/ *.glade
include cadbiom_gui/gt_gui/legend.png
......@@ -33,6 +33,6 @@ dev_uninstall:
@echo Uninstalling the package for developers...
python2.7 setup.py develop --uninstall
upload:
python2.7 setup.py sdist
upload: clean sdist
python setup.py bdist_wheel
twine upload dist/* -r pypi_inria
......@@ -32,14 +32,14 @@
# Standard imports
from setuptools import setup, find_packages
__PACKAGE_VERSION__ = "0.1.0"
__PACKAGE_VERSION__ = "0.1.1"
__LIBRARY_VERSION__ = "0.1.0"
setup(
# Library name & version
name='cadbiom_gui',
version=__LIBRARY_VERSION__,
version=__PACKAGE_VERSION__,
# Search all packages recursively
packages=find_packages(),
......
......@@ -38,6 +38,5 @@ unit_tests:
@echo Launch unit tests
python2.7 setup.py test
upload:
python2.7 setup.py sdist
upload: clean sdist
twine upload dist/* -r pypi_inria
......@@ -88,7 +88,9 @@ The location of this script may vary depending on your Linux distro
Cadbiom software requires a SAT solver which is
proposed as a Python wrapper by an independant library (pycryptosat).
*For now, pycryptosat is not on pypi; so we use a fork from
*For now, an non official version of pycryptosat is on pypi and it is used by packages;
Source of the fork if you want to compile it manually:
[Cryptominisat repository](https://github.com/msoos/cryptominisat/tree/5.0.1)*
Here you will find the installation commands of the pycryptosat package:
......@@ -101,6 +103,12 @@ Here you will find the installation commands of the pycryptosat package:
### Cadbiom
If you want to install from pypi, just do:
pip install cadbiom-cmd
pip install cadbiom-gui
If you want to install the library with its GUI, and command line in one command,
after the git clone step, just do:
......
......@@ -35,7 +35,7 @@ from distutils import sysconfig
from setuptools import setup, Extension, find_packages
from setuptools.command.test import test as TestCommand
__PACKAGE_VERSION__ = "0.1.0"
__PACKAGE_VERSION__ = "0.1.1"
__LIBRARY_VERSION__ = "0.1.0"
################################################################################
......@@ -116,7 +116,7 @@ modules = [
setup(
name="cadbiom",
version=__LIBRARY_VERSION__,
version=__PACKAGE_VERSION__,
author="Pierre Vignet",
author_email="pierre.vignet@irisa.fr",
url = "https://gitlab.irisa.fr/0000B8EG/Cadbiom/tree/pypi_packaging",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment