From b2156685955acb228f7f68ffd5cbc7500920105c Mon Sep 17 00:00:00 2001 From: itzaname Date: Sun, 23 Oct 2022 15:48:09 -0400 Subject: [PATCH] Add init --- pyproject.toml | 12 ++++++++++++ setup.py | 11 ----------- strafesnet/__init__.py | 0 strafesnet/bots_pb2_grpc.py | 2 +- strafesnet/datastore_pb2_grpc.py | 2 +- strafesnet/events_pb2_grpc.py | 2 +- strafesnet/maps_pb2_grpc.py | 2 +- strafesnet/ranks_pb2.py | 2 +- strafesnet/ranks_pb2_grpc.py | 2 +- strafesnet/servers_pb2.py | 4 ++-- strafesnet/servers_pb2_grpc.py | 2 +- strafesnet/times_pb2.py | 6 +++--- strafesnet/times_pb2_grpc.py | 2 +- strafesnet/transactions_pb2.py | 2 +- strafesnet/transactions_pb2_grpc.py | 2 +- strafesnet/users_pb2_grpc.py | 2 +- 16 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py create mode 100644 strafesnet/__init__.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..dacb280 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,12 @@ +[project] +name = "strafesnet" +version = "1.0" +description = "StrafesNET GRPC" + +[tool.setuptools] +# data to be included is specified in MANIFEST.in +include-package-data = true + +[tool.setuptools.packages] +find = {} + diff --git a/setup.py b/setup.py deleted file mode 100644 index 31ff461..0000000 --- a/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -from setuptools import setup - -setup( - name='strafesnet', - version='master', - packages=['strafesnet'], - description='StrafesNET python grpc modules', - install_requires=[ - "grpcio", - ], -) \ No newline at end of file diff --git a/strafesnet/__init__.py b/strafesnet/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/strafesnet/bots_pb2_grpc.py b/strafesnet/bots_pb2_grpc.py index e7a0e03..cbb5b24 100644 --- a/strafesnet/bots_pb2_grpc.py +++ b/strafesnet/bots_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import bots_pb2 as bots__pb2 +from . import bots_pb2 as bots__pb2 class BotsServiceStub(object): diff --git a/strafesnet/datastore_pb2_grpc.py b/strafesnet/datastore_pb2_grpc.py index 55d3a7f..1a4baac 100644 --- a/strafesnet/datastore_pb2_grpc.py +++ b/strafesnet/datastore_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import datastore_pb2 as datastore__pb2 +from . import datastore_pb2 as datastore__pb2 class DatastoreServiceStub(object): diff --git a/strafesnet/events_pb2_grpc.py b/strafesnet/events_pb2_grpc.py index 7f5fc31..2a279a5 100644 --- a/strafesnet/events_pb2_grpc.py +++ b/strafesnet/events_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import events_pb2 as events__pb2 +from . import events_pb2 as events__pb2 class EventsServiceStub(object): diff --git a/strafesnet/maps_pb2_grpc.py b/strafesnet/maps_pb2_grpc.py index 6c714e0..bdd769d 100644 --- a/strafesnet/maps_pb2_grpc.py +++ b/strafesnet/maps_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import maps_pb2 as maps__pb2 +from . import maps_pb2 as maps__pb2 class MapsServiceStub(object): diff --git a/strafesnet/ranks_pb2.py b/strafesnet/ranks_pb2.py index 037ba5b..f5ddaa1 100644 --- a/strafesnet/ranks_pb2.py +++ b/strafesnet/ranks_pb2.py @@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -import users_pb2 as users__pb2 +from . import users_pb2 as users__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0branks.proto\x12\x05ranks\x1a\x0busers.proto\"\x17\n\tIdMessage\x12\n\n\x02ID\x18\x01 \x01(\x03\"M\n\nGetRequest\x12\x0e\n\x06UserID\x18\x01 \x01(\x03\x12\x0f\n\x07StyleID\x18\x02 \x01(\x05\x12\x0e\n\x06GameID\x18\x03 \x01(\x05\x12\x0e\n\x06ModeID\x18\x04 \x01(\x05\"m\n\x0bListRequest\x12\x0f\n\x07StyleID\x18\x01 \x01(\x05\x12\x0e\n\x06GameID\x18\x02 \x01(\x05\x12\x0e\n\x06ModeID\x18\x03 \x01(\x05\x12\x0c\n\x04Sort\x18\x04 \x01(\x03\x12\x1f\n\x04Page\x18\x05 \x01(\x0b\x32\x11.ranks.Pagination\"-\n\x08RankList\x12!\n\x05ranks\x18\x01 \x03(\x0b\x32\x12.ranks.RankMessage\"\x9d\x01\n\x0bRankMessage\x12\n\n\x02ID\x18\x01 \x01(\x03\x12!\n\x04User\x18\x02 \x01(\x0b\x32\x13.users.UserResponse\x12\x0f\n\x07StyleID\x18\x03 \x01(\x05\x12\x0e\n\x06ModeID\x18\x04 \x01(\x05\x12\x0e\n\x06GameID\x18\x05 \x01(\x05\x12\x0c\n\x04Rank\x18\x06 \x01(\x01\x12\r\n\x05Skill\x18\x07 \x01(\x01\x12\x11\n\tUpdatedAt\x18\x08 \x01(\x03\"*\n\nPagination\x12\x0c\n\x04Size\x18\x01 \x01(\x05\x12\x0e\n\x06Number\x18\x02 \x01(\x05\"\x0e\n\x0cNullResponse2\x97\x01\n\x0cRanksService\x12,\n\x03Get\x12\x11.ranks.GetRequest\x1a\x12.ranks.RankMessage\x12+\n\x04List\x12\x12.ranks.ListRequest\x1a\x0f.ranks.RankList\x12,\n\x06\x44\x65lete\x12\x10.ranks.IdMessage\x1a\x10.ranks.IdMessageB(Z&git.itzana.me/strafesnet/go-grpc/ranksb\x06proto3') diff --git a/strafesnet/ranks_pb2_grpc.py b/strafesnet/ranks_pb2_grpc.py index 3f2b449..48e8ec9 100644 --- a/strafesnet/ranks_pb2_grpc.py +++ b/strafesnet/ranks_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import ranks_pb2 as ranks__pb2 +from . import ranks_pb2 as ranks__pb2 class RanksServiceStub(object): diff --git a/strafesnet/servers_pb2.py b/strafesnet/servers_pb2.py index ea64cf6..0d83d55 100644 --- a/strafesnet/servers_pb2.py +++ b/strafesnet/servers_pb2.py @@ -12,8 +12,8 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -import users_pb2 as users__pb2 -import maps_pb2 as maps__pb2 +from . import users_pb2 as users__pb2 +from . import maps_pb2 as maps__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rservers.proto\x12\x07servers\x1a\x0busers.proto\x1a\nmaps.proto\"2\n\nServerList\x12$\n\x07Servers\x18\x01 \x03(\x0b\x32\x13.servers.ServerItem\"\x17\n\tIdMessage\x12\n\n\x02ID\x18\x01 \x01(\t\"\xbb\x01\n\x0cServerCreate\x12\n\n\x02ID\x18\x01 \x01(\t\x12\x0f\n\x07PlaceID\x18\x02 \x01(\x03\x12\x11\n\tStartTime\x18\x03 \x01(\x03\x12\x13\n\x0bVipServerID\x18\x04 \x01(\t\x12\x0e\n\x06UserID\x18\x05 \x01(\x03\x12\x0e\n\x06GameID\x18\x06 \x01(\x05\x12\r\n\x05MapID\x18\x07 \x01(\x03\x12\x0f\n\x07MapDate\x18\x08 \x01(\x03\x12\x12\n\nPlayerList\x18\t \x03(\x03\x12\x12\n\nLastUpdate\x18\n \x01(\x03\"\xdd\x01\n\nServerItem\x12\n\n\x02ID\x18\x01 \x01(\t\x12\x0f\n\x07PlaceID\x18\x02 \x01(\x03\x12\x11\n\tStartTime\x18\x03 \x01(\x03\x12\x13\n\x0bVipServerID\x18\x04 \x01(\t\x12!\n\x04User\x18\x05 \x01(\x0b\x32\x13.users.UserResponse\x12\x0e\n\x06GameID\x18\x06 \x01(\x05\x12\x1e\n\x03Map\x18\x07 \x01(\x0b\x32\x11.maps.MapResponse\x12\x0f\n\x07MapDate\x18\x08 \x01(\x03\x12\x12\n\nPlayerList\x18\t \x03(\x03\x12\x12\n\nLastUpdate\x18\n \x01(\x03\"n\n\x0cServerUpdate\x12\n\n\x02ID\x18\x01 \x01(\t\x12\x12\n\x05MapID\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x14\n\x07MapDate\x18\x03 \x01(\x03H\x01\x88\x01\x01\x12\x12\n\nPlayerList\x18\x04 \x03(\x03\x42\x08\n\x06_MapIDB\n\n\x08_MapDate\"\xd0\x01\n\x0cServerFilter\x12\x0f\n\x02ID\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x14\n\x07PlaceID\x18\x02 \x01(\x03H\x01\x88\x01\x01\x12\x18\n\x0bVipServerID\x18\x04 \x01(\tH\x02\x88\x01\x01\x12\x13\n\x06UserID\x18\x05 \x01(\x03H\x03\x88\x01\x01\x12\x13\n\x06GameID\x18\x06 \x01(\x05H\x04\x88\x01\x01\x12\x12\n\x05MapID\x18\x07 \x01(\x03H\x05\x88\x01\x01\x42\x05\n\x03_IDB\n\n\x08_PlaceIDB\x0e\n\x0c_VipServerIDB\t\n\x07_UserIDB\t\n\x07_GameIDB\x08\n\x06_MapID\"*\n\nPagination\x12\x0c\n\x04Size\x18\x01 \x01(\x05\x12\x0e\n\x06Number\x18\x02 \x01(\x05\"]\n\x11ServerListRequest\x12%\n\x06\x46ilter\x18\x01 \x01(\x0b\x32\x15.servers.ServerFilter\x12!\n\x04Page\x18\x02 \x01(\x0b\x32\x13.servers.Pagination\"\x0e\n\x0cNullResponse2\x9d\x02\n\rServerService\x12\x36\n\x06\x43reate\x12\x15.servers.ServerCreate\x1a\x15.servers.NullResponse\x12\x36\n\x06Update\x12\x15.servers.ServerUpdate\x1a\x15.servers.NullResponse\x12\x33\n\x06\x44\x65lete\x12\x12.servers.IdMessage\x1a\x15.servers.NullResponse\x12.\n\x03Get\x12\x12.servers.IdMessage\x1a\x13.servers.ServerItem\x12\x37\n\x04List\x12\x1a.servers.ServerListRequest\x1a\x13.servers.ServerListB*Z(git.itzana.me/strafesnet/go-grpc/serversb\x06proto3') diff --git a/strafesnet/servers_pb2_grpc.py b/strafesnet/servers_pb2_grpc.py index 3675ecb..960eca3 100644 --- a/strafesnet/servers_pb2_grpc.py +++ b/strafesnet/servers_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import servers_pb2 as servers__pb2 +from . import servers_pb2 as servers__pb2 class ServerServiceStub(object): diff --git a/strafesnet/times_pb2.py b/strafesnet/times_pb2.py index c5a79ab..73deceb 100644 --- a/strafesnet/times_pb2.py +++ b/strafesnet/times_pb2.py @@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -import users_pb2 as users__pb2 -import maps_pb2 as maps__pb2 -import bots_pb2 as bots__pb2 +from . import users_pb2 as users__pb2 +from . import maps_pb2 as maps__pb2 +from . import bots_pb2 as bots__pb2 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0btimes.proto\x12\x05times\x1a\x0busers.proto\x1a\nmaps.proto\x1a\nbots.proto\"\xf1\x01\n\x0bTimeRequest\x12\n\n\x02ID\x18\x01 \x01(\x03\x12\x11\n\x04Time\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x13\n\x06UserID\x18\x03 \x01(\x03H\x01\x88\x01\x01\x12\x12\n\x05MapID\x18\x04 \x01(\x03H\x02\x88\x01\x01\x12\x11\n\x04\x44\x61te\x18\x05 \x01(\x03H\x03\x88\x01\x01\x12\x14\n\x07StyleID\x18\x06 \x01(\x05H\x04\x88\x01\x01\x12\x13\n\x06ModeID\x18\x07 \x01(\x05H\x05\x88\x01\x01\x12\x13\n\x06GameID\x18\x08 \x01(\x05H\x06\x88\x01\x01\x42\x07\n\x05_TimeB\t\n\x07_UserIDB\x08\n\x06_MapIDB\x07\n\x05_DateB\n\n\x08_StyleIDB\t\n\x07_ModeIDB\t\n\x07_GameID\"\xfc\x01\n\nTimeFilter\x12\x0f\n\x02ID\x18\x01 \x01(\x03H\x00\x88\x01\x01\x12\x11\n\x04Time\x18\x02 \x01(\x03H\x01\x88\x01\x01\x12\x13\n\x06UserID\x18\x03 \x01(\x03H\x02\x88\x01\x01\x12\x12\n\x05MapID\x18\x04 \x01(\x03H\x03\x88\x01\x01\x12\x11\n\x04\x44\x61te\x18\x05 \x01(\x03H\x04\x88\x01\x01\x12\x14\n\x07StyleID\x18\x06 \x01(\x05H\x05\x88\x01\x01\x12\x13\n\x06ModeID\x18\x07 \x01(\x05H\x06\x88\x01\x01\x12\x13\n\x06GameID\x18\x08 \x01(\x05H\x07\x88\x01\x01\x42\x05\n\x03_IDB\x07\n\x05_TimeB\t\n\x07_UserIDB\x08\n\x06_MapIDB\x07\n\x05_DateB\n\n\x08_StyleIDB\t\n\x07_ModeIDB\t\n\x07_GameID\"\xd7\x01\n\x0cTimeResponse\x12\n\n\x02ID\x18\x01 \x01(\x03\x12\x0c\n\x04Time\x18\x02 \x01(\x03\x12!\n\x04User\x18\x03 \x01(\x0b\x32\x13.users.UserResponse\x12\x1e\n\x03Map\x18\x04 \x01(\x0b\x32\x11.maps.MapResponse\x12#\n\x03\x42ot\x18\x05 \x01(\x0b\x32\x11.bots.BotResponseH\x00\x88\x01\x01\x12\x0c\n\x04\x44\x61te\x18\x06 \x01(\x03\x12\x0f\n\x07StyleID\x18\x07 \x01(\x05\x12\x0e\n\x06ModeID\x18\x08 \x01(\x05\x12\x0e\n\x06GameID\x18\t \x01(\x05\x42\x06\n\x04_Bot\"\x17\n\tIdMessage\x12\n\n\x02ID\x18\x01 \x01(\x03\"=\n\x08TimeList\x12\"\n\x05Times\x18\x01 \x03(\x0b\x32\x13.times.TimeResponse\x12\r\n\x05Total\x18\x02 \x01(\x03\"\x1c\n\x0cRankResponse\x12\x0c\n\x04Rank\x18\x01 \x01(\x03\"f\n\x0bListRequest\x12!\n\x06\x46ilter\x18\x01 \x01(\x0b\x32\x11.times.TimeFilter\x12\x13\n\x0b\x42lacklisted\x18\x02 \x01(\x08\x12\x1f\n\x04Page\x18\x03 \x01(\x0b\x32\x11.times.Pagination\"*\n\nPagination\x12\x0c\n\x04Size\x18\x01 \x01(\x05\x12\x0e\n\x06Number\x18\x02 \x01(\x05\"\x0e\n\x0cNullResponse2\xac\x02\n\x0cTimesService\x12.\n\x06\x43reate\x12\x12.times.TimeRequest\x1a\x10.times.IdMessage\x12\x31\n\x06Update\x12\x12.times.TimeRequest\x1a\x13.times.NullResponse\x12/\n\x06\x44\x65lete\x12\x10.times.IdMessage\x1a\x13.times.NullResponse\x12,\n\x03Get\x12\x10.times.IdMessage\x1a\x13.times.TimeResponse\x12+\n\x04List\x12\x12.times.ListRequest\x1a\x0f.times.TimeList\x12-\n\x04Rank\x12\x10.times.IdMessage\x1a\x13.times.RankResponseB(Z&git.itzana.me/strafesnet/go-grpc/timesb\x06proto3') diff --git a/strafesnet/times_pb2_grpc.py b/strafesnet/times_pb2_grpc.py index 072f38b..b3012c0 100644 --- a/strafesnet/times_pb2_grpc.py +++ b/strafesnet/times_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import times_pb2 as times__pb2 +from . import times_pb2 as times__pb2 class TimesServiceStub(object): diff --git a/strafesnet/transactions_pb2.py b/strafesnet/transactions_pb2.py index 3208987..03204f7 100644 --- a/strafesnet/transactions_pb2.py +++ b/strafesnet/transactions_pb2.py @@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -import users_pb2 as users__pb2 +from . import users_pb2 as users__pb2 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 diff --git a/strafesnet/transactions_pb2_grpc.py b/strafesnet/transactions_pb2_grpc.py index 24d4efa..f56e3f7 100644 --- a/strafesnet/transactions_pb2_grpc.py +++ b/strafesnet/transactions_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import transactions_pb2 as transactions__pb2 +from . import transactions_pb2 as transactions__pb2 class TransactionsServiceStub(object): diff --git a/strafesnet/users_pb2_grpc.py b/strafesnet/users_pb2_grpc.py index 0b55ec2..ce18ede 100644 --- a/strafesnet/users_pb2_grpc.py +++ b/strafesnet/users_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -import users_pb2 as users__pb2 +from . import users_pb2 as users__pb2 class UsersServiceStub(object):