On 2019/04/21 18:15, Rafael Sadowski wrote:
> On Sun Apr 21, 2019 at 12:41:56PM +0100, Stuart Henderson wrote:
> > On 2019/04/21 13:04, Rafael Sadowski wrote:
> > > On Sun Apr 21, 2019 at 11:40:24AM +0100, Stuart Henderson wrote:
> > > > On 2019/04/21 12:32, Rafael Sadowski wrote:
> > > > > Update pycharm to the latest stable 2019 release. It works quite well
> > > > > with JDK11. Are there any reasons not to switch to JDK11?
> > > >
> > > > Setting MODJAVA_VER=1.8+ already allows it to work with either 1.8 or
> > > > 11.
> > > > So the question should be, "is there any reason to prohibit people using
> > > > it with 1.8".
> > > >
> > > Hi Stuart,
> > >
> > > Thanks for your feedback. 1.8+, that wasn't clear to me. There is no
> > > reason to prohibit the use of 1.8.
> >
> > I wonder if we can improve that. Did you find the explanation for
> > MODJAVA_VER unclear, or did you not find it in port-modules(5)?
> >
>
> No, that's my personal problem. I don't like the new official JAVA
> version pattern: From 1.8, which is JAVA 8, to 11,, which is not 1.11)
> anyway.
>
> In my local setup I try to do without Java 8 completely. javaPathHelper
> points to JAVA 8 now, also with 1.8+ in MODJAVA_VER. I don't like that.
>
> But like I said, that's my problem.
If you don't want 1.8 at all, the simplest way is to uninstall it and
dependent packages, install jdk 11, then install the packages you want.
That way the dependency is set as expected and packages like pycharm
(with this script fix) won't try to use 1.8.
(Or you can take a shortcut and manually fixup jdk*/+REQUIRED_BY and
pycharm*/+REQUIRING ..)
OK for your diff.
>
> > > > Also files/pycharm is broken, it should use javaPathHelper.
> > > >
> > > I don't understand. "files/pycharm"?
> >
> > /usr/ports/devel/pycharm/files/pycharm sets the path to java at port
> > build time based on the *build* dependency version -
> >
> > export PYCHARM_JDK=${JAVA_HOME}
> >
> > and JAVA_HOME is substituted via SUBST_CMD / SUBST_VARS.
> >
> > So currently the file always has 1.8. But because the run dependency
> > is flexible, the user might not have 1.8 installed.
> >
> > It should have a RUN_DEPENDS on java/javaPathHelper, and instead of the
> > subst'ed JAVA_HOME, it should use $(javaPathHelper -h pycharm) - the
> > same problem exists in devel/intellij.
> >
>
> Wonderful hint! Thanks!
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pycharm/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- Makefile 3 Mar 2019 08:18:45 -0000 1.12
> +++ Makefile 21 Apr 2019 16:05:19 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= Python IDE based on IntelliJ IDEA
>
> -V= 2018.3.5
> +V= 2019.1.1
> DISTNAME= pycharm-community-${V}
> PKGNAME= pycharm-${V}
> CATEGORIES= devel
> @@ -21,11 +21,10 @@ MODJAVA_VER= 1.8+
>
> BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
>
> -RUN_DEPENDS= devel/desktop-file-utils
> +RUN_DEPENDS= devel/desktop-file-utils \
> + java/javaPathHelper
>
> NO_TEST= Yes
> -
> -SUBST_VARS+= JAVA_HOME
>
> PC= ${PREFIX}/pycharm
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/pycharm/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- distinfo 3 Mar 2019 08:18:45 -0000 1.10
> +++ distinfo 21 Apr 2019 16:05:19 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pycharm-community-2018.3.5.tar.gz) =
> p0Xu+PKVLJ6vsts/mvUrEXHwm5afqeKZDJPXgOhsePM=
> -SIZE (pycharm-community-2018.3.5.tar.gz) = 311914955
> +SHA256 (pycharm-community-2019.1.1.tar.gz) =
> jf6YinpX0xjTCjxSsV2tY3TaZqcvZiq21G9PXWc65f8=
> +SIZE (pycharm-community-2019.1.1.tar.gz) = 332489780
> Index: files/pycharm
> ===================================================================
> RCS file: /cvs/ports/devel/pycharm/files/pycharm,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 pycharm
> --- files/pycharm 16 Mar 2018 14:07:12 -0000 1.1.1.1
> +++ files/pycharm 21 Apr 2019 16:05:19 -0000
> @@ -12,11 +12,12 @@ DATASIZE="2048000"
> # Determine configuration settings
>
> #-----------------------------------------------------------------------------
>
> -export PYCHARM_JDK=${JAVA_HOME}
> +export JAVA_BIN=$(javaPathHelper -c pycharm)
> +export JAVA_HOME=$(javaPathHelper -h pycharm)
>
> -if [ ! -x "${PYCHARM_JDK}/bin/java" ]; then
> - echo "Error: JAVA_HOME may not be defined correctly: ${PYCHARM_JDK}"
> - echo " Unable to find Java binary ${PYCHARM_JDK}/bin/java"
> +if [ ! -x "${JAVA_BIN}" ]; then
> + echo "Error: JAVA_HOME may not be defined correctly: ${JAVA_HOME}"
> + echo " Unable to find Java binary ${JAVA_BIN}"
> exit 1
> fi
>
> @@ -40,4 +41,4 @@ if [ $(ulimit -Sd) -lt ${DATASIZE} ]; th
> [ $? -eq 0 ] || exit
> fi
>
> -PATH=${PYCHARM_JDK}/bin:$PATH exec "${PYCHARM_HOME}/bin/pycharm.sh" $@
> +PATH=${JAVA_HOME}/bin:$PATH exec "${PYCHARM_HOME}/bin/pycharm.sh" $@
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/pycharm/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST
> --- pkg/PLIST 3 Mar 2019 08:18:45 -0000 1.10
> +++ pkg/PLIST 21 Apr 2019 16:05:19 -0000
> @@ -299,8 +299,7 @@ pycharm/helpers/generator3.py
> pycharm/helpers/icon-robots.txt
> pycharm/helpers/idle.py
> pycharm/helpers/packaging_tool.py
> -pycharm/helpers/pip-10.0.1.tar.gz
> -pycharm/helpers/pip-9.0.3.tar.gz
> +pycharm/helpers/pip-19.0.3.tar.gz
> pycharm/helpers/pockets/
> pycharm/helpers/pockets/__init__.py
> pycharm/helpers/pockets/_version.py
> @@ -744,8 +743,10 @@ pycharm/helpers/pycharm/_jb_django_proje
> pycharm/helpers/pycharm/_jb_find_best_place.py
> pycharm/helpers/pycharm/_jb_manage_tasks_provider.py
> pycharm/helpers/pycharm/_jb_nosetest_runner.py
> +pycharm/helpers/pycharm/_jb_parallel_tree_manager.py
> pycharm/helpers/pycharm/_jb_pytest_runner.py
> pycharm/helpers/pycharm/_jb_runner_tools.py
> +pycharm/helpers/pycharm/_jb_serial_tree_manager.py
> pycharm/helpers/pycharm/_jb_tox_runner.py
> pycharm/helpers/pycharm/_jb_trialtest_runner.py
> pycharm/helpers/pycharm/_jb_unittest_runner.py
> @@ -812,12 +813,22 @@ pycharm/helpers/pycharm/teamcity/nose_re
> pycharm/helpers/pycharm/teamcity/pytest_plugin.py
> pycharm/helpers/pycharm/teamcity/unittestpy.py
> pycharm/helpers/pycharm/utrunner.py
> +pycharm/helpers/pycharm_display/
> +pycharm/helpers/pycharm_display/datalore/
> +pycharm/helpers/pycharm_display/datalore/__init__.py
> +pycharm/helpers/pycharm_display/datalore/display/
> +pycharm/helpers/pycharm_display/datalore/display/__init__.py
> +pycharm/helpers/pycharm_display/datalore/display/display_.py
> +pycharm/helpers/pycharm_display/datalore/display/supported_data_type.py
> +pycharm/helpers/pycharm_display/tests/
> +pycharm/helpers/pycharm_display/tests/display/
> +pycharm/helpers/pycharm_display/tests/display/test_supported_data_type.py
> pycharm/helpers/pycharm_generator_utils/
> pycharm/helpers/pycharm_generator_utils/__init__.py
> pycharm/helpers/pycharm_generator_utils/clr_tools.py
> pycharm/helpers/pycharm_generator_utils/constants.py
> pycharm/helpers/pycharm_generator_utils/module_redeclarator.py
> -pycharm/helpers/pycharm_generator_utils/pyparsing.py
> +pycharm/helpers/pycharm_generator_utils/pyparsing_py2.py
> pycharm/helpers/pycharm_generator_utils/pyparsing_py3.py
> pycharm/helpers/pycharm_generator_utils/util_methods.py
> pycharm/helpers/pycharm_matplotlib_backend/
> @@ -827,6 +838,7 @@ pycharm/helpers/pycharm_matplotlib_backe
> pycharm/helpers/pycodestyle.py
> pycharm/helpers/pydev/
> pycharm/helpers/pydev/LICENSE
> +pycharm/helpers/pydev/MANIFEST.in
> pycharm/helpers/pydev/README.rst
> pycharm/helpers/pydev/_pydev_bundle/
> pycharm/helpers/pydev/_pydev_bundle/__init__.py
> @@ -873,7 +885,6 @@ pycharm/helpers/pydev/_pydev_imps/_pydev
> pycharm/helpers/pydev/_pydev_imps/_pydev_pkgutil_old.py
> pycharm/helpers/pydev/_pydev_imps/_pydev_saved_modules.py
> pycharm/helpers/pydev/_pydev_imps/_pydev_sys_patch.py
> -pycharm/helpers/pydev/_pydev_imps/_pydev_uuid_old.py
> pycharm/helpers/pydev/_pydev_imps/_pydev_xmlrpclib.py
> pycharm/helpers/pydev/_pydev_runfiles/
> pycharm/helpers/pydev/_pydev_runfiles/__init__.py
> @@ -900,14 +911,11 @@ pycharm/helpers/pydev/_pydevd_bundle/pyd
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_custom_frames.py
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython.c
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx
> -pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_26_64.so
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so
>
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so
>
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so
>
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_37_64.cpython-37m-darwin.so
> -pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_32.pyd
> -pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_64.pyd
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd
> pycharm/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_34_32.pyd
> @@ -1099,135 +1107,20 @@ pycharm/helpers/pydev/pydevd_plugins/ext
>
> pycharm/helpers/pydev/pydevd_plugins/extensions/types/pydevd_plugin_numpy_types.py
>
> pycharm/helpers/pydev/pydevd_plugins/extensions/types/pydevd_plugins_django_form_str.py
> pycharm/helpers/pydev/pydevd_plugins/jinja2_debug.py
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/PKG-INFO
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/SOURCES.txt
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/dependency_links.txt
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/entry_points.txt
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/not-zip-safe
> +pycharm/helpers/pydev/pydevd_pycharm.egg-info/top_level.txt
> +pycharm/helpers/pydev/pydevd_pycharm.py
> pycharm/helpers/pydev/runfiles.py
> -pycharm/helpers/pydev/setup.py
> pycharm/helpers/pydev/setup_cython.py
> pycharm/helpers/pydev/stubs/
> pycharm/helpers/pydev/stubs/_django_manager_body.py
> pycharm/helpers/pydev/stubs/_get_tips.py
> pycharm/helpers/pydev/stubs/pycompletion.py
> -pycharm/helpers/pydev/test_pydevd_reload/
> -pycharm/helpers/pydev/test_pydevd_reload/__init__.py
> -pycharm/helpers/pydev/test_pydevd_reload/test_pydevd_reload.py
> -pycharm/helpers/pydev/tests_pydevd/
> -pycharm/helpers/pydev/tests_pydevd/__init__.py
> -pycharm/helpers/pydev/tests_pydevd/test_check_pydevconsole.py
> -pycharm/helpers/pydev/tests_pydevd/test_get_referrers.py
> -pycharm/helpers/pydev/tests_pydevd/test_jyserver.py
> -pycharm/helpers/pydev/tests_pydevd/test_jysimpleTipper.py
> -pycharm/helpers/pydev/tests_pydevd/test_pydev_ipython_011.py
> -pycharm/helpers/pydev/tests_pydevd/test_pydevconsole.py
> -pycharm/helpers/pydev/tests_pydevd/test_pyserver.py
> -pycharm/helpers/pydev/tests_pydevd/test_signature.py
> -pycharm/helpers/pydev/tests_pydevd/test_simpleTipper.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/
> -pycharm/helpers/pydev/tests_pydevd_mainloop/README
> -pycharm/helpers/pydev/tests_pydevd_mainloop/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-glut.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-gtk.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-gtk3.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-pyglet.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-qt.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-tk.py
> -pycharm/helpers/pydev/tests_pydevd_mainloop/gui-wx.py
> -pycharm/helpers/pydev/tests_pydevd_python/
> -pycharm/helpers/pydev/tests_pydevd_python/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_python/_bytecode_many_names_example.py
> -pycharm/helpers/pydev/tests_pydevd_python/_bytecode_overflow_example.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case1.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case10.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case13.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case14.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case15.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case15_execfile.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case16.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case17.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case17a.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case18.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case19.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case2.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case20.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case3.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case4.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case56.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case7.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case89.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_event_ext.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_m_switch.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_m_switch_2.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_module_entry_point.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_qthread1.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_qthread2.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_qthread3.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_qthread4.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_remote.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_remote_1.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_remote_2.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_set_next_statement.py
> -pycharm/helpers/pydev/tests_pydevd_python/_debugger_case_type_ext.py
> -pycharm/helpers/pydev/tests_pydevd_python/_performance_1.py
> -pycharm/helpers/pydev/tests_pydevd_python/_performance_2.py
> -pycharm/helpers/pydev/tests_pydevd_python/_performance_3.py
> -pycharm/helpers/pydev/tests_pydevd_python/debugger_unittest.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/manage.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/admin.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/forms.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/models.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/index.html
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/name.html
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/tests.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/urls.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/views.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/settings.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/urls.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/wsgi.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py
> -pycharm/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py
> -pycharm/helpers/pydev/tests_pydevd_python/performance_check.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_additional_thread_info.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_debugger.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_frame_eval_and_tracing.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_process_command_line.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_pydev_monkey.py
> -pycharm/helpers/pydev/tests_pydevd_python/test_save_locals.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/
> -pycharm/helpers/pydev/tests_pydevd_runfiles/not_in_default_pythonpath.txt
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/deep_nest_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested2/non_test_file.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/__init__.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/junk.txt
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/nested3/non_test_file.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/non_test_file.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/nested_dir/simple4_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/non_test_file.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/not_in_default_pythonpath.txt
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/simple2_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/simple3_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/simpleClass_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/simpleModule_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/samples/simple_test.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/test_pydevd_property.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/test_pydevdio.py
> -pycharm/helpers/pydev/tests_pydevd_runfiles/test_runfiles.py
> pycharm/helpers/pydev/third_party/
> pycharm/helpers/pydev/third_party/isort_container/
> pycharm/helpers/pydev/third_party/isort_container/isort/
> @@ -1407,8 +1300,7 @@ pycharm/helpers/required_gen_version
> pycharm/helpers/rest_runners/
> pycharm/helpers/rest_runners/rst2smth.py
> pycharm/helpers/rest_runners/sphinx_runner.py
> -pycharm/helpers/setuptools-36.8.0.tar.gz
> -pycharm/helpers/setuptools-39.1.0.tar.gz
> +pycharm/helpers/setuptools-40.8.0.tar.gz
> pycharm/helpers/six.py
> pycharm/helpers/sphinxcontrib/
> pycharm/helpers/sphinxcontrib/__init__.py
> @@ -1696,8 +1588,7 @@ pycharm/helpers/typeshed/third_party/3/s
> pycharm/helpers/typeshed/third_party/3/six/moves/urllib_request.pyi
> pycharm/helpers/typeshed/third_party/3/six/moves/urllib_response.pyi
> pycharm/helpers/typeshed/third_party/3/six/moves/urllib_robotparser.pyi
> -pycharm/helpers/virtualenv-15.2.0.tar.gz
> -pycharm/helpers/virtualenv-16.0.0.tar.gz
> +pycharm/helpers/virtualenv-16.4.3.tar.gz
> pycharm/index/
> pycharm/index/Python/
> pycharm/index/Python/id-index.input
> @@ -1726,20 +1617,21 @@ pycharm/index/Python/sdk-stubs.names_i
> pycharm/index/Python/sdk-stubs.names_i.len
> pycharm/index/Python/sdk-stubs.version
> pycharm/lib/
> +pycharm/lib/FastInfoset-1.2.15.jar
> pycharm/lib/annotations-java5.jar
> -pycharm/lib/asm-all-7.0.jar
> +pycharm/lib/asm-all-7.0.1.jar
> pycharm/lib/automaton-1.12-1.jar
> pycharm/lib/batik-all-1.10.jar
> pycharm/lib/bcprov-jdk15on-1.60.jar
> pycharm/lib/bootstrap.jar
> pycharm/lib/cglib-nodep-3.2.4.jar
> pycharm/lib/cli-parser-1.1.2.jar
> -pycharm/lib/common-image-3.3.2.jar
> -pycharm/lib/common-io-3.3.2.jar
> -pycharm/lib/common-lang-3.3.2.jar
> +pycharm/lib/common-image-3.4.1.jar
> +pycharm/lib/common-io-3.4.1.jar
> +pycharm/lib/common-lang-3.4.1.jar
> pycharm/lib/commons-codec-1.10.jar
> pycharm/lib/commons-collections-3.2.2.jar
> -pycharm/lib/commons-compress-1.17.jar
> +pycharm/lib/commons-compress-1.18.jar
> pycharm/lib/commons-httpclient-3.1-patched.jar
> pycharm/lib/commons-imaging-1.0-RC-1.jar
> pycharm/lib/commons-lang-2.4.jar
> @@ -1759,18 +1651,23 @@ pycharm/lib/httpclient-4.5.6.jar
> pycharm/lib/httpcore-4.4.10.jar
> pycharm/lib/httpmime-4.5.6.jar
> pycharm/lib/icons.jar
> -pycharm/lib/imageio-core-3.3.2.jar
> -pycharm/lib/imageio-metadata-3.3.2.jar
> -pycharm/lib/imageio-tiff-3.3.2.jar
> +pycharm/lib/imageio-core-3.4.1.jar
> +pycharm/lib/imageio-metadata-3.4.1.jar
> +pycharm/lib/imageio-tiff-3.4.1.jar
> pycharm/lib/imgscalr-lib-4.2.jar
> pycharm/lib/ini4j-0.5.5-2.jar
> pycharm/lib/isorelax-20030108.jar
> +pycharm/lib/istack-commons-runtime-3.0.7.jar
> pycharm/lib/jackson-annotations-2.9.0.jar
> -pycharm/lib/jackson-core-2.9.6.jar
> -pycharm/lib/jackson-databind-2.9.6.jar
> +pycharm/lib/jackson-core-2.9.7.jar
> +pycharm/lib/jackson-databind-2.9.7.jar
> pycharm/lib/java-compatibility-1.0.1.jar
> pycharm/lib/javahelp-2.0.02.jar
> pycharm/lib/javassist-3.22.0-GA.jar
> +pycharm/lib/javax.activation-1.2.0.jar
> +pycharm/lib/javax.annotation-api-1.3.2.jar
> +pycharm/lib/jaxb-api-2.3.1.jar
> +pycharm/lib/jaxb-runtime-2.3.1.jar
> pycharm/lib/jaxen-1.1.6.jar
> pycharm/lib/jbcrypt-1.0.0.jar
> pycharm/lib/jdom.jar
> @@ -1779,31 +1676,31 @@ pycharm/lib/jing-20030619.jar
> pycharm/lib/jna-platform.jar
> pycharm/lib/jna.jar
> pycharm/lib/jps-model.jar
> -pycharm/lib/jsch-0.1.54.jar
> -pycharm/lib/jsoup-1.10.3.jar
> -pycharm/lib/kotlin-reflect.jar
> -pycharm/lib/kotlin-stdlib-jdk7.jar
> -pycharm/lib/kotlin-stdlib-jdk8.jar
> -pycharm/lib/kotlin-stdlib.jar
> -pycharm/lib/kotlinx-coroutines-core-0.26.1.jar
> -pycharm/lib/kotlinx-coroutines-jdk8-0.26.1.jar
> +pycharm/lib/jsch-0.1.55.jar
> +pycharm/lib/jsoup-1.11.3.jar
> +pycharm/lib/kotlin-reflect-1.3.11.jar
> +pycharm/lib/kotlin-stdlib-1.3.11.jar
> +pycharm/lib/kotlin-stdlib-common-1.3.11.jar
> +pycharm/lib/kotlin-stdlib-jdk7-1.3.11.jar
> +pycharm/lib/kotlin-stdlib-jdk8-1.3.11.jar
> +pycharm/lib/kotlinx-coroutines-core-1.0.1.jar
> +pycharm/lib/kotlinx-coroutines-core-common-1.0.1.jar
> +pycharm/lib/kotlinx-coroutines-jdk8-1.0.1.jar
> pycharm/lib/libthrift-0.11.0.jar
> pycharm/lib/log4j.jar
> pycharm/lib/lz4-1.3.0.jar
> -pycharm/lib/markdown4j-2.2-cj-1.1.jar
> pycharm/lib/markdownj-core-0.4.2-SNAPSHOT.jar
> pycharm/lib/microba.jar
> pycharm/lib/miglayout-core-5.2.jar
> pycharm/lib/miglayout-swing-5.2.jar
> -pycharm/lib/mutability-annotations-compat.jar
> pycharm/lib/nanoxml-2.2.3.jar
> -pycharm/lib/netty-buffer-4.1.30.Final.jar
> -pycharm/lib/netty-codec-4.1.30.Final.jar
> -pycharm/lib/netty-codec-http-4.1.30.Final.jar
> -pycharm/lib/netty-common-4.1.30.Final.jar
> -pycharm/lib/netty-handler-4.1.30.Final.jar
> -pycharm/lib/netty-resolver-4.1.30.Final.jar
> -pycharm/lib/netty-transport-4.1.30.Final.jar
> +pycharm/lib/netty-buffer-4.1.32.Final.jar
> +pycharm/lib/netty-codec-4.1.32.Final.jar
> +pycharm/lib/netty-codec-http-4.1.32.Final.jar
> +pycharm/lib/netty-common-4.1.32.Final.jar
> +pycharm/lib/netty-handler-4.1.32.Final.jar
> +pycharm/lib/netty-resolver-4.1.32.Final.jar
> +pycharm/lib/netty-transport-4.1.32.Final.jar
> pycharm/lib/objenesis-2.6.jar
> pycharm/lib/openapi.jar
> pycharm/lib/oro-2.0.8.jar
> @@ -1811,7 +1708,7 @@ pycharm/lib/picocontainer-1.2.jar
> pycharm/lib/platform-api.jar
> pycharm/lib/platform-impl.jar
> pycharm/lib/proxy-vole-1.0.6.jar
> -pycharm/lib/pty4j-0.8.6.jar
> +pycharm/lib/pty4j-0.9.3.jar
> pycharm/lib/purejavacomm-0.0.11.1.jar
> pycharm/lib/pycharm-pydev.jar
> pycharm/lib/pycharm.jar
> @@ -1822,19 +1719,21 @@ pycharm/lib/rngom-20051226-patched.jar
> pycharm/lib/serviceMessages.jar
> pycharm/lib/slf4j-api-1.7.25.jar
> pycharm/lib/slf4j-log4j12-1.7.25.jar
> -pycharm/lib/snakeyaml-1.22.jar
> +pycharm/lib/snakeyaml-1.23.jar
> pycharm/lib/src/
> pycharm/lib/src/pycharm-openapi-src.zip
> pycharm/lib/src/pycharm-pydev-src.zip
> pycharm/lib/stax-api-1.0.1.jar
> +pycharm/lib/stax-ex-1.8.jar
> pycharm/lib/streamex-0.6.7.jar
> pycharm/lib/swingx-core-1.6.2-2.jar
> pycharm/lib/trang-core.jar
> pycharm/lib/trilead-ssh2-build-217-jenkins-11.jar
> pycharm/lib/trove4j.jar
> +pycharm/lib/txw2-2.3.1.jar
> pycharm/lib/util.jar
> pycharm/lib/velocity-1.7.jar
> -pycharm/lib/winp-1.27.jar
> +pycharm/lib/winp-1.28.jar
> pycharm/lib/xercesImpl-2.12.0.jar
> pycharm/lib/xml-apis-ext-1.3.04.jar
> pycharm/lib/xml-resolver-1.2.jar
> @@ -1890,14 +1789,7 @@ pycharm/plugins/configurationScript/lib/
> pycharm/plugins/copyright/
> pycharm/plugins/copyright/lib/
> pycharm/plugins/copyright/lib/copyright.jar
> -pycharm/plugins/cvsIntegration/
> -pycharm/plugins/cvsIntegration/lib/
> -pycharm/plugins/cvsIntegration/lib/cvsIntegration.jar
> -pycharm/plugins/cvsIntegration/lib/cvs_util.jar
> -pycharm/plugins/cvsIntegration/lib/javacvs-src.jar
> -pycharm/plugins/cvsIntegration/lib/resources_en.jar
> -pycharm/plugins/cvsIntegration/lib/smartcvs-src.jar
> -pycharm/plugins/cvsIntegration/lib/trilead-ssh2-build213.jar
> +pycharm/plugins/copyright/lib/resources_en.jar
> pycharm/plugins/editorconfig/
> pycharm/plugins/editorconfig/lib/
> pycharm/plugins/editorconfig/lib/editorconfig-core-java.jar
> @@ -1912,16 +1804,11 @@ pycharm/plugins/git4idea/lib/resources_e
> pycharm/plugins/github/
> pycharm/plugins/github/lib/
> pycharm/plugins/github/lib/github.jar
> +pycharm/plugins/github/lib/resources_en.jar
> pycharm/plugins/hg4idea/
> pycharm/plugins/hg4idea/lib/
> pycharm/plugins/hg4idea/lib/hg4idea.jar
> pycharm/plugins/hg4idea/lib/resources_en.jar
> -pycharm/plugins/ipnb/
> -pycharm/plugins/ipnb/lib/
> -pycharm/plugins/ipnb/lib/commons-lang-2.6.jar
> -pycharm/plugins/ipnb/lib/ipnb.jar
> -pycharm/plugins/ipnb/lib/java_websocket.jar
> -pycharm/plugins/ipnb/lib/resources_en.jar
> pycharm/plugins/markdown/
> pycharm/plugins/markdown/lib/
> pycharm/plugins/markdown/lib/markdown-0.1.31.jar
> @@ -1935,9 +1822,11 @@ pycharm/plugins/properties/lib/resources
> pycharm/plugins/python-copyright/
> pycharm/plugins/python-copyright/lib/
> pycharm/plugins/python-copyright/lib/python-copyright.jar
> +pycharm/plugins/python-copyright/lib/resources_en.jar
> pycharm/plugins/python-rest/
> pycharm/plugins/python-rest/lib/
> pycharm/plugins/python-rest/lib/python-rest.jar
> +pycharm/plugins/python-rest/lib/resources_en.jar
> pycharm/plugins/python-terminal/
> pycharm/plugins/python-terminal/lib/
> pycharm/plugins/python-terminal/lib/python-terminal.jar
> @@ -1965,6 +1854,7 @@ pycharm/plugins/tasks/lib/jira.jar
> pycharm/plugins/tasks/lib/json-path-0.8.0.jar
> pycharm/plugins/tasks/lib/json-smart-1.1.1.jar
> pycharm/plugins/tasks/lib/tasks-api.jar
> +pycharm/plugins/tasks/lib/tasks-compatibility.jar
> pycharm/plugins/tasks/lib/tasks-core.jar
> pycharm/plugins/tasks/lib/wsdl4j-1.4.jar
> pycharm/plugins/terminal/
