Release: Update stable to alpha 7.140.68 #2730
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix: mdstcpip memory issue with jscope * given that jscope seems to be the only client that sets SupportsCompression flag but does not support Desc responce disable it
Co-authored-by: Timo Schroeder <cloud@ipp.mpg.de>
* Fix:improve error messages * Some minor fixes Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com>
* Compare ctx.value instead of ctx, fixes #2325 When instance of active tree is created (i.e. Tree()), comparing ctx of node and tree result in node seeming to be from another tree * Update tree.py Consistently fix python ctypes.c_void_p compare Co-authored-by: Timo Schroeder <zack-vii@users.noreply.github.com>
* Fix: explicitly setting the WRTD_TICKNS from tree node value * Modify some node options * Clean the node entries for better readability
* Feature: New Java form for a WRTD device setup * Improving the GUI options * Add better names to fields in GUI * Add new setting (TICKNS) * Add back TIGA PG site N message ID GUI * Change RX/TX tab name * Add labels explaining each of the parameters * Replace device labes with awt labes * Fix some node sources in the java code of the GUI * Add TICKNS selection and general improvements * Improve label for tick ns * Redesigned tabs * Increase of input field sizes * Improve some text readability * Rewrote label
* missing STATUS_OK in MdsIpGetDescriptor * fix: removed extra free method in PutRecordRemote * cleanup: Rename ans to xd * added MDSIP_MAX_VERSION env option to limit client version for debugging and testing * external functions should have a prefix * Fixed: RemoteAccess: connection cleanup * take more care about file descriptors, keep remote connection open by keeping one link open * tditest: test remote versions and tree cleanup Co-authored-by: Keith Erickson <kerickso@pppl.gov>
A user wants to call xlate_logicalname in camshr. New entrypoint added to expose this routine. Closes issue: #2319
Default Wait mode does not seem to work in all circumstances. this commit changes it to 'Busy' wait instead. Also: Encode strings for Python3 compatability.
Co-authored-by: GabrieleManduchi <andrea.rgn@gmail.com>
…plus node (#2348) * Feature: New TDI python fun to read data from Influxdb from an MDSplus tree * Only use getTimeContext. Query was improved to be more general * Add small comment * Read credentials from file * Change input order. Add address and credentials * Address and credentials input as MDSplus tree nodes * Add small comment * Consolidate WHERE and time start and end tiime * Refactor code * Several changes to input parameters and variable names * Fix to the 435st class so that the trig_time node is correctly populated with the star time of the shot * Add file in kernel packaging list
User reported that #pragma once, which is a nonstandard feature is not supported by their compiler. As it is 'nonstandard' it seemed sensible to revert to #ifndef _FILENAME_EXT instead
…2353) * Fix: TreeShr added TreeCleanupConnections and cleanup only at key location inthe code * Build: avoid warning by using definition for unique size * Fx: ReuseCheck takes length argument which should match HOST_UNIQUE_SIZE
Co-authored-by: mdsplus <mdsplus@scdevail.rfx.local>
…he ACQ2106 WRTD TICKNS. (#2355) * Fix: Set the WRTD_TICKNS from loaded clock plan * Fix the value of the 5M12 frequency * Improve some comments * Improve error handling * Remove 2 unused nodes * Remove un-necessary check logic and use sync_role query to check plan * Remove a small bug when building the plan string
* Refactor code to include Influx aggregation parameter to deal with setTimeContext() delta step * Add debug statements * Add comment remove TODO * Add changes to 435st and 423st so that the start time is recorded at the beginning
i merge it now so i have time to fix it in case it does not work
* Fix: matlab support for 2021a; removed deprecated stuff * Build: upodated matlab packages
The distributed TreeHook.py.example is old and would not be called if put in place. This new one will work if enabled.
* Added flake file for nix support * Added symlink to unwrapped mdsplus installation. * Updated readme for nix
* start time now uses >= * fVal/iVal/bVal is now discovered at runtime
#2701) Rename `tarfiles/` folder to `packages/`
* Fix: corrected typo that caused MdsPut2() to clear all flags * Fix: source formatting re mds_put/2_vargs() * Fix: more minor soure formatting in mds_put/2_vargs --------- Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
Jenkins now re-runs bootstrap after calculating and tagging the new version This also moves the --release/--publish=VERSION into a separate parameter called --version=VERSION This now properly passes the BRANCH/RELEASE_VERSION into bootstrap for us to override the git info
Move the Calculate Version step to the top Call Bootstrap once with the version (or 0.0.0 for PRs) Instead of having Test Packaging/Release steps, just have one Release step
…2706) Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
* First draft of MATLAB tests * Exclude the MATLAB tests from packaging * Build: MATLAB tests rewritten using argparse --------- Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
…ptools compatibility (#2698) * Change to pyproject.toml with stub setup.py * actually this requirest setuptools >= 60.0.0 for the blank setup.py * add pyproject.toml to dist files * enable python2.7 and setuptools<60 support * using slightly cleaner api * change correspondence email
* Build: configure PYTHONPATH for IDL test harness * Build: minor edit to MDSPLUS_DIR for the IDL test * Build: another syntax correction for MDSPLUS_DIR on IDL tests
…ests (#2656) * Build: enhanced IDL tests now use argparse * Build: parameterize the "write" tree for IDL tests - no longer uses hard coded tree name and shot number - also changed file permissions on run_tests.py * Build: use temporary directory for transient files --------- Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
* Build: parameterize the "write" tree for MATLAB tests - no longer uses hard-coded tree name and shot number - also deleted a comment that was no longer applicable * Build: MATLAB tests now use a temporary directory --------- Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
* Fix: Now properly handles SsINTERNAL in AcceptConnection() * Don't add connection if user is unauthorized --------- Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
Co-authored-by: Mark Winkel <mwinkel@psfc.mit.edu>
- fix is same as PR #2418 for "show current"
Using 'Release' will now use the exact version that commit is tagged with, instead of trying to bump the version based on the other commits Add comments to get_new_version.py
WhoBrokeTheBuild
added
the
branch/stable
WhoBrokeTheBuild
requested review from
zack-vii,
joshStillerman,
GabrieleManduchi,
santorofer and
mwinkel-dev
mwinkel-dev
approved these changes
Mar 19, 2024
There was a problem hiding this comment.
Approving this PR as result of conducting the following review.
- Passed the Jenkins build.
- A recursive diff confirmed that the source branch,
update-stable-7-140-68, is identical to a trial merge ofalphatostabledone in my personal repo. - Perused this PR’s entire set of changes (except for devices) to get a feel for the scope of changes. Confirmed that it includes many PRs that I’ve worked on.
- Checked the 5 files that had merge conflicts (in my personal repo) and confirmed they look good.
- Also examined the 9 files that were removed from
stable. Some were deprecated files; some were binary files. Am assuming the other removed files are unneeded.
deleted: device_support/redpitaya/prova
deleted: device_support/redpitaya/rpadc_fifo_auto.c
deleted: device_support/redpitaya/rpadc_fifo_auto.ko
deleted: java/mdsplus-api/src/main/java/mds/mdsip/MdsIpTunnel.java
deleted: matlab/MDSarg.m
deleted: matlab/mdsUseLegacy.m
deleted: matlab/NATIVEvalue.m
deleted: pydevices/RfxDevices/REDPYTADC.py
deleted: tdi/treeshr/TreeHook.example
Note that MATLAB tests are in alpha and the new stable (when this PR is merged), but won't be activated until we have a MATLAB license dedicated to Jenkins. (The "Test MATLAB" step in Jenkins is presently stubbed out, which is why it erroneously shows that MATLAB testing passed for this PR.) However, I manually ran the MATLAB and IDL test suites on alpha when PR #2720 was merged, so am confident both test suites also will work in the new stable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update stable to alpha 7.140.68 in preparation for more frequent stable updates