diff --git a/.github/workflows/release-pydev.yml b/.github/workflows/release-pydev.yml new file mode 100644 index 0000000000..f29cf080e6 --- /dev/null +++ b/.github/workflows/release-pydev.yml @@ -0,0 +1,63 @@ +name: Release - PyDev + +on: + push: + branches: + - "release-pydev" + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: 'maven' + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8.12 + + - name: Set up Python 3.8 deps + run: | + python3 -m pip install cython numpy zope.interface + + - name: Print Python/Java info + run: | + echo ---- + echo ---- + which python3 + python3 -c "import numpy;print(numpy.__version__, numpy.__file__)" + python3 -c "import django;print(django.__file__)" + python3 -c "import hmac;print(hmac.__file__)" + echo SKIPPED python3 -c "import PyQt5;print(PyQt5.__file__)" + python3 plugins/org.python.pydev.core/pysrc/interpreterInfo.py + + echo ---- + echo ---- + which java + which mvn + echo ---- rt.jar should be listed below + find /opt/hostedtoolcache/Java_Adopt_jdk/11.0.17-8/x64/ -name "*.jar" + + - name: xvfb + shell: bash + env: + DISPLAY: ":99.0" + run: | + sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 + /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX + + + - name: Build with Maven + run: mvn install -DskipTests=true + + \ No newline at end of file diff --git a/.github/workflows/tests-pydev.yml b/.github/workflows/tests-pydev.yml index fc5b52abad..09877788b8 100644 --- a/.github/workflows/tests-pydev.yml +++ b/.github/workflows/tests-pydev.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python 3.8 deps run: | - python3 -m pip install PyQt5 cython numpy django cython zope.interface + python3 -m pip install PyQt5 cython numpy django zope.interface - name: Print Python/Java info run: | diff --git a/plugins/com.python.pydev.docs/release_process.txt b/plugins/com.python.pydev.docs/release_process.txt index b3444a315f..a7b760695a 100644 --- a/plugins/com.python.pydev.docs/release_process.txt +++ b/plugins/com.python.pydev.docs/release_process.txt @@ -14,12 +14,15 @@ X:\pydev\builders\org.python.pydev.build\build_cmd.bat cd x:\pydev python update_version.py 10.1.0 + + # TODO: Get debugger binaries from modules in pypi (either during build or when + # the user starts up PyDev) so that the step below is not needed. + Make sure debugger builtins are updated and commited: - cd /D x:\PyDev.Debugger - set PYTHONPATH=x:\PyDev.Debugger - C:\bin\Python38-32\python build_tools\build.py - C:\bin\Python38-32\python build_tools\build_binaries_windows.py + cd /D x:\liclipsews\liclipsews\Pydev\plugins\org.python.pydev.core\pysrc\ + set PYTHONPATH=x:\liclipsews\liclipsews\Pydev\plugins\org.python.pydev.core\pysrc\ + python build_tools\build.py Update homepage - index.rst @@ -84,12 +87,12 @@ cd org.python.pydev.p2-repo-10.1.0-SNAPSHOT "C:\Program Files\7-Zip\7z" x ..\org.python.pydev.p2-repo-10.1.0-SNAPSHOT.zip cdd X:\pydev_build\build_dir\pydev\features\org.python.pydev.p2-repo\target\org.python.pydev.p2-repo-10.1.0-SNAPSHOT -C:\Users\fabio\AppData\Roaming\npm\surge.cmd --domain pydev-10-0-2.surge.sh +C:\Users\fabio\AppData\Roaming\npm\surge.cmd --domain pydev-10-1-0.surge.sh "C:\Program Files\FileZilla FTP Client\filezilla.exe" sftp://fabioz,pydev@frs.sourceforge.net/home/project-web/pydev/htdocs/pydev_update_site --local="X:\pydev_build\build_dir\pydev\features\org.python.pydev.p2-repo\target\org.python.pydev.p2-repo-10.1.0-SNAPSHOT" ** Tag repository: - git tag pydev_10_0_2 -a -m "PyDev 10.1.0" + git tag pydev_10_1_0 -a -m "PyDev 10.1.0" git push --tags SET CONVERT_SOURCE=X:\pydev_build\build_dir\pydev\features\org.python.pydev.p2-repo\target\org.python.pydev.p2-repo-10.1.0-SNAPSHOT @@ -97,7 +100,7 @@ SET CONVERT_FINAL_ZIP=X:\pydev_build\build_dir\pydev\features\org.python.pydev.p SET CONVERT_TARGET_DIR=X:\pydev_build\build_dir\pydev\features\org.python.pydev.p2-repo\target\github python X:\release_tools\convert_to_github.py 10.1.0 Do GH release in: - https://github.com/fabioz/Pydev/releases/new?tag=pydev_10_0_2 + https://github.com/fabioz/Pydev/releases/new?tag=pydev_10_1_0 Contents in: X:\pydev_build\build_dir\pydev\features\org.python.pydev.p2-repo\target\github Message: @@ -105,11 +108,11 @@ Do GH release in: It's possible to add it as an Eclipse update site using the url: - https://github.com/fabioz/Pydev/releases/download/pydev_10_0_2/ + https://github.com/fabioz/Pydev/releases/download/pydev_10_1_0/ Or get a .zip to install manually by unzipping it in the dropins: - https://github.com/fabioz/Pydev/releases/download/pydev_10_0_2/PyDev.10.1.0.zip + https://github.com/fabioz/Pydev/releases/download/pydev_10_1_0/PyDev.10.1.0.zip ** Update homepage: diff --git a/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt b/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt index 1ddfbedd35..ac047483b8 100644 --- a/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt +++ b/plugins/org.python.pydev.core/pysrc/build_tools/pydevd_release_process.txt @@ -3,8 +3,26 @@ __version_info__ in pydevd.py +Create tag: +----------- +git tag pydev_debugger_2_9_5 -a -m "PyDev.Debugger 2.9.5" +git push --tags + + +(pushing the tag does the release to PyPi now) + + + + + + + + + +Old release process (locally): +================================= -2. Create conda envs +Create conda envs ===================== conda create -y -f -n py36_64 python=3.6 cython numpy nose ipython pip @@ -76,7 +94,7 @@ activate py311_64 pip install cython==0.29.32 conda deactivate -4. Regenerate the .pyx and .c +Regenerate the .pyx and .c =============================== set FORCE_PYDEVD_VC_VARS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat @@ -94,7 +112,7 @@ cd ~/Desktop/Pydev/plugins/org.python.pydev.core/pysrc export PYTHONPATH=~/Desktop/Pydev/plugins/org.python.pydev.core/pysrc python build_tools/build.py -3. Generate new version +Generate new version ====================== cd /D x:\debugpyws\PyDev.Debugger