Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing sub level areas of packages in the wmc-database module #11592

Conversation

todor-ivanov
Copy link
Contributor

@todor-ivanov todor-ivanov commented May 15, 2023

Fixes #11591

Status

ready

Description

With the current PR we are fixing the missing sub level areas of the wmc-database package. We start including everything under the packages' directories recursively.

Is it backward compatible (if not, which system it affects?)

YES

Related PRs

None

External dependencies / deployment changes

None

@todor-ivanov
Copy link
Contributor Author

Hi @vkuznet @amaltaro

This PR, for sure, fixes the issue. I have tested it by manually building and installing the package in one of my VMs: [1]
Sorry for rushing the things a little bit here, but I am about to merge this and cut a new 2.2.1rc3 tag, because I'd like to have all final bits resolved for this PR: dmwm/CMSKubernetes#1364

[1]
Datastructs packages:

(pypi-test.venv) [user@unit01 pypi-test.venv]$ ll ./lib/python3.9/site-packages/WMCore/DataStructs/
total 120
drwxr-xr-x.  4 cmst1 zh  4096 May 15 12:38 .
drwxr-xr-x. 30 cmst1 zh  4096 May 15 12:38 ..
-rw-r--r--.  1 cmst1 zh  5211 May  9 12:56 File.py
-rw-r--r--.  1 cmst1 zh  3866 May  9 12:56 Fileset.py
-rw-r--r--.  1 cmst1 zh   112 May  9 12:56 __init__.py
-rw-r--r--.  1 cmst1 zh  3897 May  9 12:56 JobGroup.py
-rw-r--r--.  1 cmst1 zh  1147 May  9 12:56 JobPackage.py
-rw-r--r--.  1 cmst1 zh  5029 May  9 12:56 Job.py
-rw-r--r--.  1 cmst1 zh 27401 May  9 12:56 LumiList.py
-rw-r--r--.  1 cmst1 zh  6128 May  9 12:56 Mask.py
drwxr-xr-x.  3 cmst1 zh  4096 May 15 12:38 MathStructs
-rw-r--r--.  1 cmst1 zh   367 May  9 12:56 Pickleable.py
drwxr-xr-x.  2 cmst1 zh  4096 May 15 12:38 __pycache__
-rw-r--r--.  1 cmst1 zh  8768 May  9 12:56 Run.py
-rw-r--r--.  1 cmst1 zh  5601 May  9 12:56 Subscription.py
-rw-r--r--.  1 cmst1 zh  1074 May  9 12:56 WMObject.py
-rw-r--r--.  1 cmst1 zh  1845 May  9 12:56 Workflow.py
-rw-r--r--.  1 cmst1 zh  3810 May  9 12:56 WorkUnit.py


and Database packages:

(pypi-test.venv) [user@unit01 pypi-test.venv]$ ll ./lib/python3.9/site-packages/WMCore/Database/
total 172
drwxr-xr-x.  5 cmst1 zh  4096 May 15 12:38 .
drwxr-xr-x. 30 cmst1 zh  4096 May 15 12:38 ..
-rw-r--r--.  1 cmst1 zh 55027 May  9 12:56 CMSCouch.py
-rw-r--r--.  1 cmst1 zh   860 May  9 12:56 ConfigDBMap.py
-rw-r--r--.  1 cmst1 zh  3476 May  9 12:56 CouchUtils.py
-rw-r--r--.  1 cmst1 zh  7336 May  9 12:56 DBCore.py
-rw-r--r--.  1 cmst1 zh  3666 May  9 12:56 DBCreator.py
-rw-r--r--.  1 cmst1 zh  2395 May  9 12:56 DBExceptionHandler.py
-rw-r--r--.  1 cmst1 zh  4070 May  9 12:56 DBFactory.py
-rw-r--r--.  1 cmst1 zh  5578 May  9 12:56 DBFormatter.py
-rw-r--r--.  1 cmst1 zh   411 May  9 12:56 Dialects.py
-rw-r--r--.  1 cmst1 zh 12078 May  9 12:56 ExecuteDAO.py
-rw-r--r--.  1 cmst1 zh   115 May  9 12:56 __init__.py
-rw-r--r--.  1 cmst1 zh 11958 May  9 12:56 ipy_profile_couch.py
-rw-r--r--.  1 cmst1 zh 10808 May  9 12:56 MongoDB.py
drwxr-xr-x.  3 cmst1 zh  4096 May 15 12:38 MySQL
-rw-r--r--.  1 cmst1 zh  4400 May  9 12:56 MySQLCore.py
drwxr-xr-x.  3 cmst1 zh  4096 May 15 12:38 Oracle
drwxr-xr-x.  2 cmst1 zh  4096 May 15 12:38 __pycache__
-rw-r--r--.  1 cmst1 zh  1078 May  9 12:56 ResultSet.py
-rw-r--r--.  1 cmst1 zh  2441 May  9 12:56 Transaction.py


@cmsdmwmbot
Copy link

Jenkins results:

  • Python3 Unit tests: failed
    • 5 new failures
    • 1 changes in unstable tests
  • Python3 Pylint check: succeeded
    • 1 comments to review
  • Pylint py3k check: succeeded
  • Pycodestyle check: succeeded
    • 28 comments to review

Details at https://cmssdt.cern.ch/dmwm-jenkins/view/All/job/DMWM-WMCore-PR-test/14259/artifact/artifacts/PullRequestReport.html

@todor-ivanov
Copy link
Contributor Author

The broken unit tests are unrelated to the current PR.
I am merging this one.
FYI @amaltaro @vkuznet

@todor-ivanov todor-ivanov merged commit 1e0a80e into dmwm:master May 15, 2023
nhduongvn pushed a commit to nhduongvn/WMCore that referenced this pull request Jan 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing WMCore.Datastructs.MathStructs && WMCore.Database.* in wmagent pypi package
2 participants