Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc7e3ca893 | |||
| 9a4635c561 | |||
| 9f873333f5 | |||
| 50c78d679e | |||
| 72dcb674eb | |||
| 9d038de3ab | |||
| 52a667f28e | |||
| 31cd12160b | |||
| 22e7f18648 | |||
| 97815ead9d | |||
| 332331465d | |||
| b56f006103 | |||
| 1fdefc8929 | |||
| f51dd28e46 | |||
| e22bfd72ea | |||
| 739d8bc189 |
@@ -65,7 +65,7 @@ workflows:
|
|||||||
- test:
|
- test:
|
||||||
matrix:
|
matrix:
|
||||||
parameters:
|
parameters:
|
||||||
tag: ["3.7", "3.8", "3.9", "3.10"]
|
tag: ["3.6", "3.7", "3.8", "3.9"]
|
||||||
filters:
|
filters:
|
||||||
tags:
|
tags:
|
||||||
only: /.*/
|
only: /.*/
|
||||||
|
|||||||
Generated
+450
-410
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -11,11 +11,11 @@ homepage = "https://speckle.systems/"
|
|||||||
|
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = ">=3.7.0, <4.0"
|
python = "^3.6.5"
|
||||||
pydantic = "^1.8.2"
|
pydantic = "^1.8.2"
|
||||||
appdirs = "^1.4.4"
|
appdirs = "^1.4.4"
|
||||||
gql = {extras = ["requests", "websockets"], version = "^3.3.0"}
|
gql = {extras = ["requests", "websockets"], version = "^3.3.0"}
|
||||||
ujson = "^5.3.0"
|
ujson = "^4.3.0"
|
||||||
Deprecated = "^1.2.13"
|
Deprecated = "^1.2.13"
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ class Singleton(type):
|
|||||||
class MetricsTracker(metaclass=Singleton):
|
class MetricsTracker(metaclass=Singleton):
|
||||||
analytics_url = "https://analytics.speckle.systems/track?ip=1"
|
analytics_url = "https://analytics.speckle.systems/track?ip=1"
|
||||||
analytics_token = "acd87c5a50b56df91a795e999812a3a4"
|
analytics_token = "acd87c5a50b56df91a795e999812a3a4"
|
||||||
|
user_ip = None
|
||||||
last_user = None
|
last_user = None
|
||||||
last_server = None
|
last_server = None
|
||||||
platform = None
|
platform = None
|
||||||
@@ -113,6 +114,7 @@ class MetricsTracker(metaclass=Singleton):
|
|||||||
)
|
)
|
||||||
self.platform = PLATFORMS.get(sys.platform, "linux")
|
self.platform = PLATFORMS.get(sys.platform, "linux")
|
||||||
self.sending_thread.start()
|
self.sending_thread.start()
|
||||||
|
self.user_ip = socket.gethostbyname(socket.gethostname())
|
||||||
|
|
||||||
def set_last_user(self, email: str):
|
def set_last_user(self, email: str):
|
||||||
if not email:
|
if not email:
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ class Base(_RegisteringBase):
|
|||||||
id: Optional[str] = None
|
id: Optional[str] = None
|
||||||
totalChildrenCount: Optional[int] = None
|
totalChildrenCount: Optional[int] = None
|
||||||
applicationId: Optional[str] = None
|
applicationId: Optional[str] = None
|
||||||
_units: str = None
|
_units: str = "m"
|
||||||
# dict of chunkable props and their max chunk size
|
# dict of chunkable props and their max chunk size
|
||||||
_chunkable: Dict[str, int] = {}
|
_chunkable: Dict[str, int] = {}
|
||||||
_chunk_size_default: int = 1000
|
_chunk_size_default: int = 1000
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ UNITS_STRINGS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UNITS_ENCODINGS = {
|
UNITS_ENCODINGS = {
|
||||||
None: 0,
|
|
||||||
"none": 0,
|
"none": 0,
|
||||||
"mm": 1,
|
"mm": 1,
|
||||||
"cm": 2,
|
"cm": 2,
|
||||||
@@ -59,5 +58,7 @@ def get_units_from_encoding(unit: int):
|
|||||||
def get_encoding_from_units(unit: str):
|
def get_encoding_from_units(unit: str):
|
||||||
try:
|
try:
|
||||||
return UNITS_ENCODINGS[unit]
|
return UNITS_ENCODINGS[unit]
|
||||||
except KeyError as e:
|
except KeyError:
|
||||||
raise SpeckleException(message=f"No encoding exists for unit {unit}. Please enter a valid unit to encode (eg {UNITS_ENCODINGS}).") from e
|
raise SpeckleException(
|
||||||
|
message=f"No encoding exists for unit {unit}. Please enter a valid unit to encode (eg {UNITS_ENCODINGS})."
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user