marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

feature/port-to-py3 #11

Merged
marcel merged 59 commits from feature/port-to-py3 into develop 2022-03-21 15:30:06 +01:00
Conversation 0 Commits 59 Files Changed 45 +3662 -1573
kaan commented 2021-06-21 11:35:36 +02:00
Collaborator
Copy Link

Current working version of PyLot when pylot.yml is used to build the environment. I/O, Picking & filtering, map work. Needs work on event list and Nlocn integration

Current working version of PyLot when pylot.yml is used to build the environment. I/O, Picking & filtering, map work. Needs work on event list and Nlocn integration
kaan added 11 commits 2021-06-21 11:35:37 +02:00
kaan added 1 commit 2021-07-09 10:06:37 +02:00
marcel added 2 commits 2021-07-09 12:11:29 +02:00
marcel added 1 commit 2021-07-09 12:17:17 +02:00 
fixes #14
marcel added 1 commit 2021-07-09 15:31:58 +02:00
marcel added 1 commit 2021-07-15 12:05:09 +02:00
marcel added 1 commit 2021-07-16 11:11:10 +02:00
marcel added 1 commit 2021-07-20 14:10:28 +02:00
marcel added 1 commit 2021-07-20 17:24:44 +02:00
kaan added 1 commit 2021-07-28 10:11:21 +02:00
kaan added 1 commit 2021-07-28 10:14:18 +02:00
kaan added 1 commit 2021-08-04 16:58:22 +02:00
kaan added 1 commit 2021-08-04 17:05:51 +02:00
marcel closed this pull request 2021-08-10 10:53:51 +02:00
marcel reopened this pull request 2021-08-10 10:54:16 +02:00
marcel added 1 commit 2021-08-10 17:41:40 +02:00
marcel added 2 commits 2021-08-11 16:18:59 +02:00
marcel added 1 commit 2021-08-12 09:42:44 +02:00
sebastianw requested changes 2021-08-12 14:53:13 +02:00
sebastianw left a comment
Collaborator
Copy Link

Pull request have been commented. Minor changes requested. Go ahaed if implemented.

Pull request have been commented. Minor changes requested. Go ahaed if implemented.
PyLoT.py Outdated
@ -40,1 +39,3 @@
matplotlib.rcParams['savefig.dpi'] = 300
# set environment variables to use Qt5 and don't convert to Qt4 syntax
# os.environ['PYQTGRAPH_QT_LIB'] = 'PyQt5'
# os.environ["QT_API"] = "pyqt5"
sebastianw commented 2021-08-12 14:10:28 +02:00
Collaborator
Copy Link

Please remove commented code if not needed for backup solution implementation. In this case just remove.

Please remove commented code if not needed for backup solution implementation. In this case just remove.
kaan marked this conversation as resolved
PyLoT.py Outdated
@ -3227,2 +3252,2 @@
ma_count_total = {'manual': 0,
'auto': 0}
#ma_count_total = {'manual': 0,
# 'auto': 0}
sebastianw commented 2021-08-12 14:28:18 +02:00
Collaborator
Copy Link

See above! Remove commented code.

See above! Remove commented code.
kaan marked this conversation as resolved
pylot.yml Outdated
@ -0,0 +115,4 @@
- zipp=3.4.1=pyhd8ed1ab_0
- zlib=1.2.11=h516909a_1010
- zstd=1.4.9=ha95c52a_0
prefix: /home/kaan/.conda/envs/pylot_py35
sebastianw commented 2021-08-12 14:36:12 +02:00
Collaborator
Copy Link

This has no benefit for other users than Kaan. Please generalize the file.

This has no benefit for other users than Kaan. Please generalize the file.
kaan marked this conversation as resolved
pylot/core/io/data.py Outdated
@ -24,0 +25,4 @@
str_TypeLst = [str, unicode] # if python 2.X
except NameError:
str_TypeLst = [str] # if python 3.*
sebastianw commented 2021-08-12 14:37:33 +02:00
Collaborator
Copy Link

Obsolete since backwards compatibility to 2.x not possible after merge.

Obsolete since backwards compatibility to 2.x not possible after merge.
kaan marked this conversation as resolved
pylot/core/io/data.py Outdated
@ -48,3 +53,3 @@
evt = readPILOTEvent(**evtdata)
evtdata = evt
elif type(evtdata) in [str, unicode]:
elif type(evtdata) in str_TypeLst:
sebastianw commented 2021-08-12 14:38:07 +02:00
Collaborator
Copy Link

See above!

See above!
kaan marked this conversation as resolved
pylot/core/util/array_map.py Outdated
@ -69,0 +95,4 @@
def init_graphics(self):
"""
Initializes all GUI components and figure elements to be populeted by other functions
sebastianw commented 2021-08-12 14:45:10 +02:00
Collaborator
Copy Link

Typo: populated

Typo: populated
kaan marked this conversation as resolved
pylot/core/util/array_map.py Outdated
@ -69,0 +105,4 @@
else:
self.canvas = MplCanvas(self, extern_axes=self.extern_plot_axes)
#self.canvas.axes = self.extern_plot_axes
#self.canvas.fig = self.extern_plot_axes.figure
sebastianw commented 2021-08-12 14:45:31 +02:00
Collaborator
Copy Link

see above, commented code

see above, commented code
kaan marked this conversation as resolved
pylot/core/util/array_map.py
@ -74,0 +188,4 @@
def add_merid_paral(self):
self.gridlines = self.canvas.axes.gridlines(draw_labels=False, alpha=0.8, color='dimgray', linewidth=self.linewidth, zorder=7)
# current cartopy version does not support label removal. Devs are working on it.
sebastianw commented 2021-08-12 14:46:57 +02:00
Collaborator
Copy Link

consider adding "TODO:" comment for future releases of cartopy

consider adding "TODO:" comment for future releases of cartopy
kaan marked this conversation as resolved
kaan added 2 commits 2021-08-12 15:43:33 +02:00
kaan requested review from sebastianw 2021-08-26 11:23:00 +02:00
marcel added 1 commit 2022-03-07 14:47:13 +01:00
marcel added 1 commit 2022-03-07 15:32:40 +01:00
kaan added 4 commits 2022-03-08 12:58:49 +01:00
marcel added 3 commits 2022-03-08 16:31:09 +01:00
marcel added 2 commits 2022-03-09 11:00:16 +01:00
marcel added 1 commit 2022-03-09 14:08:11 +01:00
marcel added 2 commits 2022-03-09 14:41:58 +01:00
marcel added 1 commit 2022-03-14 13:19:27 +01:00
marcel added 3 commits 2022-03-14 16:06:05 +01:00
marcel added 1 commit 2022-03-15 09:44:10 +01:00
marcel added 1 commit 2022-03-15 10:15:03 +01:00
marcel added 2 commits 2022-03-15 10:44:04 +01:00
marcel added 1 commit 2022-03-15 10:45:10 +01:00
marcel added 1 commit 2022-03-15 11:14:15 +01:00
marcel added 2 commits 2022-03-16 14:31:01 +01:00
marcel added 1 commit 2022-03-16 14:31:11 +01:00
marcel added 1 commit 2022-03-16 16:00:26 +01:00
marcel added 1 commit 2022-03-16 16:04:00 +01:00
marcel self-assigned this 2022-03-21 15:09:10 +01:00
sebastianw was assigned by marcel 2022-03-21 15:09:10 +01:00
marcel approved these changes 2022-03-21 15:16:54 +01:00
marcel left a comment
Owner
Copy Link

Merge all updates from feature/port-to-py3 into develop, so that the feature branch can (theoretically) be closed now.
From now on, PyLoT will run in Python3!

Merge all updates from feature/port-to-py3 into develop, so that the feature branch can (theoretically) be closed now. From now on, PyLoT will run in Python3!
marcel removed review request for sebastianw 2022-03-21 15:18:54 +01:00
marcel changed title from WIP: feature/port-to-py3 to feature/port-to-py3 2022-03-21 15:29:42 +01:00
marcel merged commit 83ba63a3fd into develop 2022-03-21 15:30:06 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
sebastianw
marcel
Labels
Clear labels   
analysis

   
bug

   
documentation

   
enhancement

   
feature

   
incompatibility

   
management

   
Priority:0

   
Priority:1

   
Priority:2

   
Priority:3
No Label
analysis
bug
documentation
enhancement
feature
incompatibility
management
Priority:0
Priority:1
Priority:2
Priority:3
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
marcel
sebastianw
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: marcel/pylot#11
No description provided.
Delete Branch "feature/port-to-py3"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?