changeset 1036:0d7e5e290ea3

upload to pypi
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 03 Jul 2018 16:47:37 -0400
parents 933588568bec
children 6a6c37eb3a74
files .hgignore Makefile scripts/process.py setup.py
diffstat 4 files changed, 22 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Jun 20 16:48:20 2018 -0400
+++ b/.hgignore	Tue Jul 03 16:47:37 2018 -0400
@@ -29,6 +29,8 @@
 bin
 build
 CMakeFiles
+dist
+trafficintelligence.egg-info
 ipch
 win32-depends/opencv/
 win32-depends/boost/
--- a/Makefile	Wed Jun 20 16:48:20 2018 -0400
+++ b/Makefile	Tue Jul 03 16:47:37 2018 -0400
@@ -14,11 +14,15 @@
 installpython:
 	@echo "========================================="
 	@echo "Installing Python modules and scripts"
-	@tar cf /tmp/trafficintelligence.tar setup.py trafficintelligence
+	@tar cf /tmp/trafficintelligence.tar setup.py README trafficintelligence
 	@gzip /tmp/trafficintelligence.tar
 	@pip3 install /tmp/trafficintelligence.tar.gz
 	@rm /tmp/trafficintelligence.tar.gz
 	@cp scripts/* $(INSTALL_DIR)
+uploadpython:
+	@python setup.py sdist bdist_wheel
+	@twine upload dist/* --skip-existing
+	#python setup.py sdist upload
 
 install: cexe installpython
 	@echo "========================================="
--- a/scripts/process.py	Wed Jun 20 16:48:20 2018 -0400
+++ b/scripts/process.py	Tue Jul 03 16:47:37 2018 -0400
@@ -21,7 +21,7 @@
 
 # main function
 parser.add_argument('--delete', dest = 'delete', help = 'data to delete', choices = ['feature', 'object', 'classification', 'interaction'])
-parser.add_argument('--process', dest = 'process', help = 'data to process', choices = ['feature', 'object', 'classification', 'interaction'])
+parser.add_argument('--process', dest = 'process', help = 'data to process', choices = ['feature', 'object', 'classification', 'prototype', 'interaction'])
 parser.add_argument('--display', dest = 'display', help = 'data to display (replay over video)', choices = ['feature', 'object', 'classification', 'interaction'])
 parser.add_argument('--analyze', dest = 'analyze', help = 'data to analyze (results)', choices = ['feature', 'object', 'classification', 'interaction'])
 
--- a/setup.py	Wed Jun 20 16:48:20 2018 -0400
+++ b/setup.py	Tue Jul 03 16:47:37 2018 -0400
@@ -1,13 +1,20 @@
-from setuptools import setup
+import setuptools
 
-setup(
+with open('README') as file:
+    long_description = file.read()
+
+setuptools.setup(
     name='trafficintelligence',
-    version=0.2,
-    description='Python modules of the Traffic Intelligence project',
+    version='0.2.2',
     author='Nicolas Saunier',
     author_email='nicolas.saunier@polymtl.ca',
     url='https://bitbucket.org/Nicolas/trafficintelligence',
-    packages=['trafficintelligence']
-    #py_modules = ['moving', 'utils']
-    #scripts=['helloworld']
+    packages=setuptools.find_packages(),
+    description='Python modules of the Traffic Intelligence project',
+    long_description=long_description,
+    classifiers=(
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ),
 )