Merge pull request #26 from memgraph/change-win-workflow

Update windows workflow

Author: jbajic

.github/workflows/ci.yml

@@ -68,10 +68,10 @@ jobs:
         arch:
           - { mingw: "64", msys: x86_64, python: "x64" }
         python_version:
-          - 3.6
+          - 3.7
           - 3.9
         mgversion:
-          - 1.4.0
+          - 2.0.0
     steps:
       - uses: actions/checkout@v2
         with:
@@ -120,11 +120,7 @@ jobs:
         run: python -m pip install -f dist --no-index pymgclient
       - name: Run tests
         run: |
-          if( ${{ matrix.mgversion }} -match "^2" ) {
-            python3 -m pytest -v
-          }else {
-            python3 -m pytest -v -m "not temporal"
-          }
+          python3 -m pytest -v
         env:
           MEMGRAPH_HOST: "localhost"
           MEMGRAPH_STARTED_WITH_SSL:

.github/workflows/release.yml

@@ -63,7 +63,6 @@ jobs:
         arch:
           - { mingw: "64", msys: x86_64, python: "x64"}
         python_version:
-          - 3.6
           - 3.7
           - 3.8
           - 3.9

.gitignore

@@ -8,6 +8,7 @@ pymgclient.egg-info/
 *.swo
 
 # python temporary files
+.venv
 *.pyc
 *.pyo
-__pycache__/
+__pycache__/

CHANGELOG.rst

@@ -11,6 +11,8 @@ Changelog
 Breaking Changes
 ****************
 
+  * `pymgclient` is supported only for >3.7 python versions on Windows.
+
 ******************************
 Major Feature and Improvements
 ******************************

docs/source/introduction.rst

@@ -23,7 +23,7 @@ pymgclient has prebuilt binary packages for
 * macOS 10.15+ x86_64 (not arm64) with `Python
   <https://www.python.org/downloads/>`_ 3.7+
 
-* Windows 10 x86_64 with `Python <https://www.python.org/downloads/>`_ 3.6+
+* Windows 10 x86_64 with `Python <https://www.python.org/downloads/>`_ 3.7+
 
 To intall pymgclient binaries on these platforms see `Install binaries`_
 section or check `Install from source`_ for other platforms.

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+markers =
+    temporal: mark a test that tests temporal types.

setup.py

@@ -12,17 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import os
 import pathlib
 import platform
 import shutil
-
-from setuptools import setup, Extension
-from setuptools.command.build_ext import build_ext
+import sys
 from distutils import log
 from distutils.core import DistutilsExecError, DistutilsPlatformError
 
+from setuptools import Extension, setup
+from setuptools.command.build_ext import build_ext
 
 IS_WINDOWS = sys.platform == 'win32'
 IS_APPLE = sys.platform == 'darwin'

src/glue.c

@@ -239,7 +239,7 @@ PyObject *make_py_date(int y, int m, int d) {
   return date;
 }
 
-PyObject *make_py_time(int h, int min, int sec, int mi) {
+PyObject *make_py_time(int64_t h, int64_t min, int64_t sec, int64_t mi) {
   PyObject *time = PyTime_FromTime(h, min, sec, mi);
   if (!time) {
     PyErr_Print();
@@ -279,15 +279,28 @@ PyObject *mg_date_to_py_date(const mg_date *date) {
 }
 
 PyObject *mg_local_time_to_py_time(const mg_local_time *lt) {
-  long nanos = mg_local_time_nanoseconds(lt);
-  long one_sec_to_nanos = 1000000000;
-  SCOPED_CLEANUP PyObject *seconds = PyLong_FromLong(nanos / one_sec_to_nanos);
-  long leftover_nanos = nanos % one_sec_to_nanos;
+  const int64_t nanos = mg_local_time_nanoseconds(lt);
+  const int64_t one_sec_to_nanos = 1000000000;
+  SCOPED_CLEANUP PyObject *seconds =
+      PyLong_FromLongLong(nanos / one_sec_to_nanos);
+  const int64_t leftover_nanos = nanos % one_sec_to_nanos;
+  // The reason for different implementation of getting utc time from timestamp
+  // is because we need to explicitly define utc timezone on Windows unlike on
+  // linux, but that API is only allowed in py3.7, therefore the support for
+  // Windows is only for python version >= 3.7.
+#ifdef _WIN32
+  SCOPED_CLEANUP PyObject *method_name = PyUnicode_FromString("fromtimestamp");
+  IF_PTR_IS_NULL_RETURN(method_name, NULL);
+  SCOPED_CLEANUP PyObject *result = PyObject_CallMethodObjArgs(
+      (PyObject *)PyDateTimeAPI->DateTimeType, method_name, seconds,
+      PyDateTime_TimeZone_UTC, NULL);
+#else
   SCOPED_CLEANUP PyObject *method_name =
       PyUnicode_FromString("utcfromtimestamp");
   IF_PTR_IS_NULL_RETURN(method_name, NULL);
-  SCOPED_CLEANUP PyObject *result =
-      PyObject_CallMethodObjArgs((PyObject*)PyDateTimeAPI->DateTimeType, method_name, seconds, NULL);
+  SCOPED_CLEANUP PyObject *result = PyObject_CallMethodObjArgs(
+      (PyObject *)PyDateTimeAPI->DateTimeType, method_name, seconds, NULL);
+#endif
   IF_PTR_IS_NULL_RETURN(result, NULL);
   SCOPED_CLEANUP PyObject *h = PyObject_GetAttrString(result, "hour");
   IF_PTR_IS_NULL_RETURN(h, NULL);
@@ -307,8 +320,8 @@ PyObject *mg_local_date_time_to_py_datetime(const mg_local_date_time *ldt) {
   IF_PTR_IS_NULL_RETURN(seconds, NULL);
   SCOPED_CLEANUP PyObject *method_name = PyUnicode_FromString("fromtimestamp");
   IF_PTR_IS_NULL_RETURN(method_name, NULL);
-  SCOPED_CLEANUP PyObject *result =
-      PyObject_CallMethodObjArgs((PyObject*)PyDateTimeAPI->DateTimeType, method_name, seconds, NULL);
+  SCOPED_CLEANUP PyObject *result = PyObject_CallMethodObjArgs(
+      (PyObject *)PyDateTimeAPI->DateTimeType, method_name, seconds, NULL);
   IF_PTR_IS_NULL_RETURN(result, NULL);
   SCOPED_CLEANUP PyObject *y = PyObject_GetAttrString(result, "year");
   SCOPED_CLEANUP PyObject *mo = PyObject_GetAttrString(result, "month");
@@ -495,9 +508,7 @@ int64_t microseconds_to_nanos(int64_t microseconds) {
   return microseconds * 1000;
 }
 
-int64_t seconds_to_nanos(int64_t seconds) {
-  return microseconds_to_nanos(seconds * 1000000);
-}
+int64_t seconds_to_nanos(int64_t seconds) { return seconds * 1000000 * 1000; }
 
 int64_t minutes_to_nanos(int64_t minutes) {
   return seconds_to_nanos(minutes * 60);
@@ -506,10 +517,10 @@ int64_t minutes_to_nanos(int64_t minutes) {
 int64_t hours_to_nanos(int64_t hours) { return minutes_to_nanos(hours * 60); }
 
 int64_t nanoseconds_since_epoch(PyObject *obj) {
-  int h = PyDateTime_TIME_GET_HOUR(obj);
-  int m = PyDateTime_TIME_GET_MINUTE(obj);
-  int s = PyDateTime_TIME_GET_SECOND(obj);
-  int mi = PyDateTime_TIME_GET_MICROSECOND(obj);
+  int64_t h = PyDateTime_TIME_GET_HOUR(obj);
+  int64_t m = PyDateTime_TIME_GET_MINUTE(obj);
+  int64_t s = PyDateTime_TIME_GET_SECOND(obj);
+  int64_t mi = PyDateTime_TIME_GET_MICROSECOND(obj);
   return hours_to_nanos(h) + minutes_to_nanos(m) + seconds_to_nanos(s) +
          microseconds_to_nanos(mi);
 }