From 0f928f89b1ef46a6a0f92eb1d7b6af5a6616ffff Mon Sep 17 00:00:00 2001 From: Dennis Piehl Date: Tue, 11 Feb 2025 15:12:50 -0500 Subject: [PATCH] update version number and HISTORY --- HISTORY.txt | 3 ++- azure-template-publish-job.yml | 4 ++-- azure-template-tox-job.yml | 6 +++--- rcsb/db/cli/RepoLoadExec.py | 8 +++++++- rcsb/db/cli/__init__.py | 2 +- tox.ini | 3 +-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/HISTORY.txt b/HISTORY.txt index 2d94cef..92cea53 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -365,4 +365,5 @@ Update CI/CD testing to use python 3.10 23-Dec-2024 V1.726 Skip integers that exceed max int32 in DataTransformFactory 7-Jan-2025 V1.727 Handle "None" values in vrpt data - 22-Jan-2025 V1.728 Add Imgs format option (for jpg/svg generation) to splitIdList() \ No newline at end of file + 22-Jan-2025 V1.728 Add Imgs format option (for jpg/svg generation) to splitIdList() + 11-Feb-2025 V1.800 Removal of unused code and dependencies (MySQL, SQL, CockroachDB, CrateDB, and other accessory code snippets) \ No newline at end of file diff --git a/azure-template-publish-job.yml b/azure-template-publish-job.yml index 33e4eda..08b5248 100644 --- a/azure-template-publish-job.yml +++ b/azure-template-publish-job.yml @@ -15,9 +15,9 @@ jobs: - job: ${{ format('publish_{0}_{1}', parameters.tox, parameters.os) }} pool: ${{ if eq(parameters.os, 'macos') }}: - vmImage: 'macOS-13' + vmImage: 'macOS-15' ${{ if eq(parameters.os, 'linux') }}: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-latest' dependsOn: - ${{ format('build_test_{0}_{1}', parameters.tox, parameters.os) }} condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) diff --git a/azure-template-tox-job.yml b/azure-template-tox-job.yml index a63cc62..ec1b5c1 100644 --- a/azure-template-tox-job.yml +++ b/azure-template-tox-job.yml @@ -18,9 +18,9 @@ jobs: timeoutInMinutes: 0 pool: ${{ if eq(parameters.os, 'macos') }}: - vmImage: "macOS-13" + vmImage: "macOS-15" ${{ if eq(parameters.os, 'linux') }}: - vmImage: "ubuntu-22.04" + vmImage: "ubuntu-latest" variables: - group: py-shared-variables @@ -43,7 +43,7 @@ jobs: - bash: | set -e ls -la /Applications/Xcode* - sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer + sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer which g++ c++ --version displayName: "setup Xcode" diff --git a/rcsb/db/cli/RepoLoadExec.py b/rcsb/db/cli/RepoLoadExec.py index d9d5476..00c7a7b 100644 --- a/rcsb/db/cli/RepoLoadExec.py +++ b/rcsb/db/cli/RepoLoadExec.py @@ -117,8 +117,14 @@ def main(): help="Compare the number of loaded entries with the number expected by the holdings (for op 'pdbx_loader_check')" ) parser.add_argument("--log_file_path", default=None, help="Path to runtime log file output.") + # # args for imgs workflow format - parser.add_argument("--incremental_update", default=False, action="store_true", help="Whether the process should look at timestamps (see --target_file_dir and --target_file_suffix) to find a delta list of ids to update. Default is a full update.") + parser.add_argument( + "--incremental_update", + default=False, + action="store_true", + help="Whether the process should look at timestamps (see --target_file_dir and --target_file_suffix) to find a delta list of ids to update. Default is a full update." + ) parser.add_argument("--target_file_dir", default=None, help="Location of files for timestamp comparisons.") parser.add_argument("--target_file_suffix", default="", help="Suffix attached to pdb id for timestamp comparison file.") # diff --git a/rcsb/db/cli/__init__.py b/rcsb/db/cli/__init__.py index d6d26fc..c6ca5dc 100644 --- a/rcsb/db/cli/__init__.py +++ b/rcsb/db/cli/__init__.py @@ -2,4 +2,4 @@ __author__ = "John Westbrook" __email__ = "john.westbrook@rcsb.org" __license__ = "Apache 2.0" -__version__ = "1.728" +__version__ = "1.800" diff --git a/tox.ini b/tox.ini index cf671ee..52e3ac8 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ fixture_path_1 = "rcsb/db/tests" test_path_1 = "rcsb/db/tests" test_path_2 = "rcsb/db/tests-mongo" test_path_3 = "rcsb/db/cli" -test_path_4 = "rcsb/db/cli" # TODO: is this a duplicate? +# # These are placeholders valid source directories without tests files #test_path_2 = "rcsb/db/tests-validate" #test_path_3 = "rcsb/db/tests-mongo" @@ -72,7 +72,6 @@ commands = {envpython} -m unittest discover -v --start-directory {[local_settings]test_path_1} --pattern "{[local_settings]test_pattern}" {envpython} -m unittest discover -v --start-directory {[local_settings]test_path_2} --pattern "{[local_settings]test_pattern}" {envpython} -m unittest discover -v --start-directory {[local_settings]test_path_3} --pattern "{[local_settings]test_pattern}" - {envpython} -m unittest discover -v --start-directory {[local_settings]test_path_4} --pattern "{[local_settings]test_pattern}" echo "Completed {envname}" #