From 83c71bb805641889181ac44688a434aca951583b Mon Sep 17 00:00:00 2001 From: Erasmus Cedernaes Date: Wed, 1 Dec 2021 15:50:09 +0100 Subject: [PATCH 1/4] Making the Python 3 package pip-installable --- .gitignore | 3 +++ Python3/src/{xpc.py => xpc/__init__.py} | 0 setup.py | 12 ++++++++++++ 3 files changed, 15 insertions(+) rename Python3/src/{xpc.py => xpc/__init__.py} (100%) create mode 100755 setup.py diff --git a/.gitignore b/.gitignore index 8c184fe..66438fc 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,6 @@ out/ ################# Docs/~$Capability Matrix.xlsx *.xpl +*.egg-info +build +dist diff --git a/Python3/src/xpc.py b/Python3/src/xpc/__init__.py similarity index 100% rename from Python3/src/xpc.py rename to Python3/src/xpc/__init__.py diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..5932881 --- /dev/null +++ b/setup.py @@ -0,0 +1,12 @@ +from setuptools import setup, find_packages + + +setup( + name="xplaneconnect", + version="1.0.0", + python_requires=">=3", + packages=find_packages("Python3/src"), + package_dir={"": "Python3/src"}, + description="XPlaneConnect (XPC) facilitates communication to and from the XPCPlugin.", + url="https://github.com/nasa/XPlaneConnect/", +) From 6acb765bd01a35b24578eb7cc619d1ec6d951cce Mon Sep 17 00:00:00 2001 From: Erasmus Cedernaes Date: Thu, 2 Dec 2021 20:32:05 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Christopher Teubert --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5932881..03a6528 100755 --- a/setup.py +++ b/setup.py @@ -7,6 +7,12 @@ setup( python_requires=">=3", packages=find_packages("Python3/src"), package_dir={"": "Python3/src"}, - description="XPlaneConnect (XPC) facilitates communication to and from the XPCPlugin.", + description="XPlaneConnect (XPC) facilitates communication to and from the XPCPlugin. Note: To use the XPC package, you must first install the XPCPlugin. See https://github.com/nasa/XPlaneConnect/wiki/Getting-Started for instructions on installing the XPCPlugin", url="https://github.com/nasa/XPlaneConnect/", + project_urls={ # Optional + 'Bug Reports': 'https://github.com/nasa/xplaneconnect/issues', + 'Organization': 'https://www.nasa.gov/content/diagnostics-prognostics', + 'Source': 'https://github.com/nasa/xplaneconnect', + 'Documentation': 'https://github.com/nasa/XPlaneConnect/wiki' + } ) From 791f225bd25ef2431febe608d436237980e88076 Mon Sep 17 00:00:00 2001 From: Erasmus Cedernaes Date: Thu, 2 Dec 2021 20:38:34 +0100 Subject: [PATCH 3/4] Unifying quotation marks and removing comment --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 03a6528..f8dc835 100755 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ setup( package_dir={"": "Python3/src"}, description="XPlaneConnect (XPC) facilitates communication to and from the XPCPlugin. Note: To use the XPC package, you must first install the XPCPlugin. See https://github.com/nasa/XPlaneConnect/wiki/Getting-Started for instructions on installing the XPCPlugin", url="https://github.com/nasa/XPlaneConnect/", - project_urls={ # Optional - 'Bug Reports': 'https://github.com/nasa/xplaneconnect/issues', - 'Organization': 'https://www.nasa.gov/content/diagnostics-prognostics', - 'Source': 'https://github.com/nasa/xplaneconnect', - 'Documentation': 'https://github.com/nasa/XPlaneConnect/wiki' + project_urls={ + "Bug Reports": "https://github.com/nasa/xplaneconnect/issues", + "Organization": "https://www.nasa.gov/content/diagnostics-prognostics", + "Source": "https://github.com/nasa/xplaneconnect", + "Documentation": "https://github.com/nasa/XPlaneConnect/wiki" } ) From 0d462ac306bc802a3b269227d3b98d2507abcd40 Mon Sep 17 00:00:00 2001 From: Erasmus Cedernaes Date: Thu, 2 Dec 2021 20:41:26 +0100 Subject: [PATCH 4/4] Making the version same as the XPC plugin --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f8dc835..0c55565 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup( name="xplaneconnect", - version="1.0.0", + version="1.3rc6", python_requires=">=3", packages=find_packages("Python3/src"), package_dir={"": "Python3/src"},