From cfb2f5d693c14a1078da58e6939d6dc482754d83 Mon Sep 17 00:00:00 2001 From: Martin Varga Date: Mon, 23 Sep 2019 17:42:38 +0200 Subject: [PATCH] update to pygeodiff 0.3 with changed distribution --- Pipfile | 1 + Pipfile.lock | 68 +++++++++++++++++++++----------------- README.md | 1 - mergin/client.py | 8 +---- mergin/test/test_client.py | 6 +--- setup.py | 3 +- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/Pipfile b/Pipfile index 4ee36c3a..f559155d 100644 --- a/Pipfile +++ b/Pipfile @@ -5,6 +5,7 @@ name = "pypi" [packages] python-dateutil = "==2.6.0" +pygeodiff = "==0.3.0" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 628f3d49..96a4d328 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "bac257d7028262757b233ae58079cff6908a0f3bee99a4179835df16ddde4ccc" + "sha256": "88604779febe0455d50436901e72c30378de84a79432fe50659b4bba84d20c7c" }, "pipfile-spec": 6, "requires": { @@ -16,6 +16,13 @@ ] }, "default": { + "pygeodiff": { + "hashes": [ + "sha256:6aa1b7afc2824362ebc877b0d26951a0184cef5f342a6720c739e6c1b77ba1a9" + ], + "index": "pypi", + "version": "==0.3.0" + }, "python-dateutil": { "hashes": [ "sha256:3acbef017340600e9ff8f2994d8f7afd6eacb295383f286466a6df3961e486f0", @@ -94,10 +101,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8", - "sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3" + "sha256:aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26", + "sha256:d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af" ], - "version": "==0.19" + "markers": "python_version < '3.8'", + "version": "==0.23" }, "isort": { "hashes": [ @@ -108,26 +116,26 @@ }, "lazy-object-proxy": { "hashes": [ - "sha256:159a745e61422217881c4de71f9eafd9d703b93af95618635849fe469a283661", - "sha256:23f63c0821cc96a23332e45dfaa83266feff8adc72b9bcaef86c202af765244f", - "sha256:3b11be575475db2e8a6e11215f5aa95b9ec14de658628776e10d96fa0b4dac13", - "sha256:3f447aff8bc61ca8b42b73304f6a44fa0d915487de144652816f950a3f1ab821", - "sha256:4ba73f6089cd9b9478bc0a4fa807b47dbdb8fad1d8f31a0f0a5dbf26a4527a71", - "sha256:4f53eadd9932055eac465bd3ca1bd610e4d7141e1278012bd1f28646aebc1d0e", - "sha256:64483bd7154580158ea90de5b8e5e6fc29a16a9b4db24f10193f0c1ae3f9d1ea", - "sha256:6f72d42b0d04bfee2397aa1862262654b56922c20a9bb66bb76b6f0e5e4f9229", - "sha256:7c7f1ec07b227bdc561299fa2328e85000f90179a2f44ea30579d38e037cb3d4", - "sha256:7c8b1ba1e15c10b13cad4171cfa77f5bb5ec2580abc5a353907780805ebe158e", - "sha256:8559b94b823f85342e10d3d9ca4ba5478168e1ac5658a8a2f18c991ba9c52c20", - "sha256:a262c7dfb046f00e12a2bdd1bafaed2408114a89ac414b0af8755c696eb3fc16", - "sha256:acce4e3267610c4fdb6632b3886fe3f2f7dd641158a843cf6b6a68e4ce81477b", - "sha256:be089bb6b83fac7f29d357b2dc4cf2b8eb8d98fe9d9ff89f9ea6012970a853c7", - "sha256:bfab710d859c779f273cc48fb86af38d6e9210f38287df0069a63e40b45a2f5c", - "sha256:c10d29019927301d524a22ced72706380de7cfc50f767217485a912b4c8bd82a", - "sha256:dd6e2b598849b3d7aee2295ac765a578879830fb8966f70be8cd472e6069932e", - "sha256:e408f1eacc0a68fed0c08da45f31d0ebb38079f043328dce69ff133b95c29dc1" - ], - "version": "==1.4.1" + "sha256:02b260c8deb80db09325b99edf62ae344ce9bc64d68b7a634410b8e9a568edbf", + "sha256:18f9c401083a4ba6e162355873f906315332ea7035803d0fd8166051e3d402e3", + "sha256:1f2c6209a8917c525c1e2b55a716135ca4658a3042b5122d4e3413a4030c26ce", + "sha256:2f06d97f0ca0f414f6b707c974aaf8829c2292c1c497642f63824119d770226f", + "sha256:616c94f8176808f4018b39f9638080ed86f96b55370b5a9463b2ee5c926f6c5f", + "sha256:63b91e30ef47ef68a30f0c3c278fbfe9822319c15f34b7538a829515b84ca2a0", + "sha256:77b454f03860b844f758c5d5c6e5f18d27de899a3db367f4af06bec2e6013a8e", + "sha256:83fe27ba321e4cfac466178606147d3c0aa18e8087507caec78ed5a966a64905", + "sha256:84742532d39f72df959d237912344d8a1764c2d03fe58beba96a87bfa11a76d8", + "sha256:874ebf3caaf55a020aeb08acead813baf5a305927a71ce88c9377970fe7ad3c2", + "sha256:9f5caf2c7436d44f3cec97c2fa7791f8a675170badbfa86e1992ca1b84c37009", + "sha256:a0c8758d01fcdfe7ae8e4b4017b13552efa7f1197dd7358dc9da0576f9d0328a", + "sha256:a4def978d9d28cda2d960c279318d46b327632686d82b4917516c36d4c274512", + "sha256:ad4f4be843dace866af5fc142509e9b9817ca0c59342fdb176ab6ad552c927f5", + "sha256:ae33dd198f772f714420c5ab698ff05ff900150486c648d29951e9c70694338e", + "sha256:b4a2b782b8a8c5522ad35c93e04d60e2ba7f7dcb9271ec8e8c3e08239be6c7b4", + "sha256:c462eb33f6abca3b34cdedbe84d761f31a60b814e173b98ede3c81bb48967c4f", + "sha256:fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1" + ], + "version": "==1.4.2" }, "mccabe": { "hashes": [ @@ -145,10 +153,10 @@ }, "pluggy": { "hashes": [ - "sha256:0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc", - "sha256:b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c" + "sha256:0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", + "sha256:fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" ], - "version": "==0.12.0" + "version": "==0.13.0" }, "py": { "hashes": [ @@ -217,10 +225,10 @@ }, "zipp": { "hashes": [ - "sha256:4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a", - "sha256:8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec" + "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e", + "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335" ], - "version": "==0.5.2" + "version": "==0.6.0" } } } diff --git a/README.md b/README.md index bc7ba4ba..44d23698 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ For using mergin client with its dependencies packaged locally run: mkdir -p mergin/deps pip wheel -r mergin_client.egg-info/requires.txt -w mergin/deps -Build and add [geodiff](https://github.com/lutraconsulting/geodiff) lib (libgeodiff.so) and pygeodiff wheel to mergin/deps. ## Tests For running test do: diff --git a/mergin/client.py b/mergin/client.py index 8b45578f..414fe9f3 100644 --- a/mergin/client.py +++ b/mergin/client.py @@ -16,7 +16,6 @@ from .utils import save_to_file, generate_checksum, move_file, DateTimeEncoder, int_version, find this_dir = os.path.dirname(os.path.realpath(__file__)) -GEODIFFLIB = os.path.join(os.path.dirname(os.path.realpath(__file__)), "deps/libgeodiff.so") try: import dateutil.parser @@ -60,13 +59,8 @@ def __init__(self, directory): self.dir = os.path.abspath(directory) if not os.path.exists(self.dir): raise InvalidProject('Project directory does not exist') - - try: - lib = os.environ.get("GEODIFFLIB", GEODIFFLIB) - self.geodiff = pygeodiff.GeoDiff(lib) - except OSError: - self.geodiff = None + self.geodiff = pygeodiff.GeoDiff() if os.environ.get('GEODIFF_ENABLED', 'True').lower() == 'true' else None self.meta_dir = os.path.join(self.dir, '.mergin') if not os.path.exists(self.meta_dir): os.mkdir(self.meta_dir) diff --git a/mergin/test/test_client.py b/mergin/test/test_client.py index c971caae..aea8ca98 100644 --- a/mergin/test/test_client.py +++ b/mergin/test/test_client.py @@ -10,7 +10,6 @@ USER_PWD = os.environ.get('TEST_API_PASSWORD') TMP_DIR = tempfile.gettempdir() TEST_DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'test_data') -GEODIFFLIB = os.environ.get("GEODIFFLIB", '../deps/libgeodiff.so') @pytest.fixture(scope='function') @@ -197,10 +196,7 @@ def test_ignore_files(mc): @pytest.mark.parametrize("diffs_limit, push_geodiff_enabled, pull_geodiff_enabled", diff_test_scenarios) def test_sync_diff(mc, diffs_limit, push_geodiff_enabled, pull_geodiff_enabled): def toggle_geodiff(enabled): - if enabled: - os.environ['GEODIFFLIB'] = GEODIFFLIB - else: - os.environ['GEODIFFLIB'] = 'libgeodiff' # invalid path causing failure + os.environ['GEODIFF_ENABLED'] = str(enabled) test_project = f'test_sync_diff_{diffs_limit}_{int(push_geodiff_enabled)}_{int(pull_geodiff_enabled)}' project = API_USER + '/' + test_project diff --git a/setup.py b/setup.py index 423ebe0d..08a45385 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,8 @@ platforms='any', install_requires=[ - 'python-dateutil' + 'python-dateutil==2.6.0', + 'pygeodiff==0.3.0' ], test_suite='nose.collector',