Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix package wheel and deploy #519

Merged
merged 4 commits into from
Feb 22, 2020
Merged

Fix package wheel and deploy #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bac2c0
WIP
jovany-wang Feb 18, 2020
61a0a7e
Fox
jovany-wang Feb 18, 2020
7c13570
Fix
jovany-wang Feb 22, 2020
a4b8888
Merge branch 'master' into fix_wheel
jovany-wang Feb 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/python/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ pushd ../../
mvn clean install -DskipTests

# copy distkv-server jar to wheel dist.
cp server/target/distkv-server-0.1.3-SNAPSHOT-jar-with-dependencies.jar deploy/python/distkv/jars/distkv-server.jar
cp server/target/distkv-server-0.1.3-SNAPSHOT-jar-with-dependencies.jar deploy/python/dkv/jars/distkv-server.jar
# copy distkv-cli jar to wheel dist.
cp client/target/distkv-client-0.1.3-SNAPSHOT-jar-with-dependencies.jar deploy/python/distkv/jars/distkv-cli.jar
cp client/target/distkv-client-0.1.3-SNAPSHOT-jar-with-dependencies.jar deploy/python/dkv/jars/distkv-cli.jar

popd
0 deploy/python/distkv/__init__.py → deploy/python/dkv/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion deploy/python/distkv_cli.py → deploy/python/dkv/distkv_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def main():
command = [
"java",
"-classpath",
os.path.join(get_current_dir(), "distkv/jars/distkv-cli.jar"),
os.path.join(get_current_dir(), "jars/distkv-cli.jar"),
"com.distkv.client.commandlinetool.DistkvCommandLineToolStarter"]
try:
subprocess.check_call(command)
Expand Down
2 changes: 1 addition & 1 deletion deploy/python/distkv_server.py → deploy/python/dkv/distkv_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def main():
command = [
"java",
"-classpath",
os.path.join(get_current_dir(), "distkv/jars/distkv-server.jar"),
os.path.join(get_current_dir(), "jars/distkv-server.jar"),
"com.distkv.server.storeserver.StoreServer"]
try:
subprocess.check_call(command)
Expand Down
0 deploy/python/distkv/jars/.gitkeep → deploy/python/dkv/jars/.gitkeep
View file
Open in desktop
File renamed without changes.
Empty file added deploy/python/dkv/jars/__init__.py
View file
Open in desktop
Empty file.
10 changes: 7 additions & 3 deletions deploy/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ def has_ext_modules(self):
author_email='kingchin1218@gmail.com',
license='BSD-3-clause',
url='https://github.com/distkv-project/distkv',
packages=['distkv'],
packages=['dkv'],
package_data={
'dkv': ['*'],
},
cmdclass={"build_ext": build_ext},
# The BinaryDistribution argument triggers build_ext.
distclass=BinaryDistribution,
install_requires=[],
entry_points={
"console_scripts": [
"dkv-server=distkv_server:main",
"dkv-cli=distkv_cli:main",
"dkv-server=dkv.distkv_server:main",
"dkv-cli=dkv.distkv_cli:main",
]
},
# include_package_data=True,
)