From b34e95fa91d1a2e0f9d4066d71c5b915a4a56b7c Mon Sep 17 00:00:00 2001 From: Yuvrajsinghspd09 Date: Fri, 17 Jan 2025 19:49:24 +0530 Subject: [PATCH] Improve logging and add availability field (#128, #117) --- =0.25 | 0 =0.8, | 0 =1.0.0 | 0 =1.3.0 | 222 ++++++++++++++++++ =2.4.0 | 0 =4.0 | 0 =4.2.2 | 0 .../jsonschemas/records/record-v1.0.0.json | 5 +- cernopendata/modules/fixtures/cli.py | 20 +- setup.py | 4 +- 10 files changed, 237 insertions(+), 14 deletions(-) create mode 100644 =0.25 create mode 100644 =0.8, create mode 100644 =1.0.0 create mode 100644 =1.3.0 create mode 100644 =2.4.0 create mode 100644 =4.0 create mode 100644 =4.2.2 diff --git a/=0.25 b/=0.25 new file mode 100644 index 0000000..e69de29 diff --git a/=0.8, b/=0.8, new file mode 100644 index 0000000..e69de29 diff --git a/=1.0.0 b/=1.0.0 new file mode 100644 index 0000000..e69de29 diff --git a/=1.3.0 b/=1.3.0 new file mode 100644 index 0000000..8f7e76e --- /dev/null +++ b/=1.3.0 @@ -0,0 +1,222 @@ +Collecting pytest==7.4.4 + Obtaining dependency information for pytest==7.4.4 from https://files.pythonhosted.org/packages/51/ff/f6e8b8f39e08547faece4bd80f89d5a8de68a38b2d179cc1c4490ffa3286/pytest-7.4.4-py3-none-any.whl.metadata + Downloading pytest-7.4.4-py3-none-any.whl.metadata (7.9 kB) +Collecting pytest-cov==4.1.0 + Obtaining dependency information for pytest-cov==4.1.0 from https://files.pythonhosted.org/packages/a7/4b/8b78d126e275efa2379b1c2e09dc52cf70df16fc3b90613ef82531499d73/pytest_cov-4.1.0-py3-none-any.whl.metadata + Downloading pytest_cov-4.1.0-py3-none-any.whl.metadata (26 kB) +Collecting pytest-cache==1.0 + Downloading pytest-cache-1.0.tar.gz (16 kB) + Installing build dependencies: started + Installing build dependencies: finished with status 'done' + Getting requirements to build wheel: started + Getting requirements to build wheel: finished with status 'done' + Preparing metadata (pyproject.toml): started + Preparing metadata (pyproject.toml): finished with status 'done' +Collecting pydocstyle + Obtaining dependency information for pydocstyle from https://files.pythonhosted.org/packages/36/ea/99ddefac41971acad68f14114f38261c1f27dac0b3ec529824ebc739bdaa/pydocstyle-6.3.0-py3-none-any.whl.metadata + Downloading pydocstyle-6.3.0-py3-none-any.whl.metadata (3.7 kB) +Collecting pycodestyle + Obtaining dependency information for pycodestyle from https://files.pythonhosted.org/packages/3a/d8/a211b3f85e99a0daa2ddec96c949cac6824bd305b040571b82a03dd62636/pycodestyle-2.12.1-py2.py3-none-any.whl.metadata + Downloading pycodestyle-2.12.1-py2.py3-none-any.whl.metadata (4.5 kB) +Collecting isort + Obtaining dependency information for isort from https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl.metadata + Downloading isort-5.13.2-py3-none-any.whl.metadata (12 kB) +Collecting coverage + Obtaining dependency information for coverage from https://files.pythonhosted.org/packages/db/11/3f8e803a43b79bc534c6a506674da9d614e990e37118b4506faf70d46ed6/coverage-7.6.10-cp311-cp311-win_amd64.whl.metadata + Downloading coverage-7.6.10-cp311-cp311-win_amd64.whl.metadata (8.4 kB) +Collecting check-manifest + Obtaining dependency information for check-manifest from https://files.pythonhosted.org/packages/71/55/92207fa9b92ac2ade5593b1280f804f2590a680b7fe96775eb26074eec6b/check_manifest-0.50-py3-none-any.whl.metadata + Downloading check_manifest-0.50-py3-none-any.whl.metadata (20 kB) +Collecting beautifulsoup4==4.12.3 + Obtaining dependency information for beautifulsoup4==4.12.3 from https://files.pythonhosted.org/packages/b1/fe/e8c672695b37eecc5cbf43e1d0638d88d66ba3a44c4d321c796f4e59167f/beautifulsoup4-4.12.3-py3-none-any.whl.metadata + Downloading beautifulsoup4-4.12.3-py3-none-any.whl.metadata (3.8 kB) +Collecting locustio>=0.8 + Downloading locustio-0.999.tar.gz (267 kB) + -------------------------------------- 267.6/267.6 kB 5.5 MB/s eta 0:00:00 + Installing build dependencies: started + Installing build dependencies: finished with status 'done' + Getting requirements to build wheel: started + Getting requirements to build wheel: finished with status 'done' + Preparing metadata (pyproject.toml): started + Preparing metadata (pyproject.toml): finished with status 'done' + Obtaining dependency information for locustio>=0.8 from https://files.pythonhosted.org/packages/56/a6/b63507b1366b2adcad807e154df3d18a4fb00eb0670c5cbcc086f8f235c9/locustio-0.12.2-py2.py3-none-any.whl.metadata + Downloading locustio-0.12.2-py2.py3-none-any.whl.metadata (1.3 kB) +Collecting mock + Obtaining dependency information for mock from https://files.pythonhosted.org/packages/6b/20/471f41173930550f279ccb65596a5ac19b9ac974a8d93679bcd3e0c31498/mock-5.1.0-py3-none-any.whl.metadata + Downloading mock-5.1.0-py3-none-any.whl.metadata (3.0 kB) +Collecting iniconfig (from pytest==7.4.4) + Obtaining dependency information for iniconfig from https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl.metadata + Downloading iniconfig-2.0.0-py3-none-any.whl.metadata (2.6 kB) +Collecting packaging (from pytest==7.4.4) + Obtaining dependency information for packaging from https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl.metadata + Downloading packaging-24.2-py3-none-any.whl.metadata (3.2 kB) +Collecting pluggy<2.0,>=0.12 (from pytest==7.4.4) + Obtaining dependency information for pluggy<2.0,>=0.12 from https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl.metadata + Downloading pluggy-1.5.0-py3-none-any.whl.metadata (4.8 kB) +Collecting colorama (from pytest==7.4.4) + Obtaining dependency information for colorama from https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl.metadata + Using cached colorama-0.4.6-py2.py3-none-any.whl.metadata (17 kB) +Collecting execnet>=1.1.dev1 (from pytest-cache==1.0) + Obtaining dependency information for execnet>=1.1.dev1 from https://files.pythonhosted.org/packages/43/09/2aea36ff60d16dd8879bdb2f5b3ee0ba8d08cbbdcdfe870e695ce3784385/execnet-2.1.1-py3-none-any.whl.metadata + Downloading execnet-2.1.1-py3-none-any.whl.metadata (2.9 kB) +Collecting soupsieve>1.2 (from beautifulsoup4==4.12.3) + Obtaining dependency information for soupsieve>1.2 from https://files.pythonhosted.org/packages/d1/c2/fe97d779f3ef3b15f05c94a2f1e3d21732574ed441687474db9d342a7315/soupsieve-2.6-py3-none-any.whl.metadata + Downloading soupsieve-2.6-py3-none-any.whl.metadata (4.6 kB) +Collecting snowballstemmer>=2.2.0 (from pydocstyle) + Obtaining dependency information for snowballstemmer>=2.2.0 from https://files.pythonhosted.org/packages/ed/dc/c02e01294f7265e63a7315fe086dd1df7dacb9f840a804da846b96d01b96/snowballstemmer-2.2.0-py2.py3-none-any.whl.metadata + Downloading snowballstemmer-2.2.0-py2.py3-none-any.whl.metadata (6.5 kB) +Collecting build>=0.1 (from check-manifest) + Obtaining dependency information for build>=0.1 from https://files.pythonhosted.org/packages/84/c2/80633736cd183ee4a62107413def345f7e6e3c01563dbca1417363cf957e/build-1.2.2.post1-py3-none-any.whl.metadata + Downloading build-1.2.2.post1-py3-none-any.whl.metadata (6.5 kB) +Requirement already satisfied: setuptools in c:\users\yuvra\onedrive\desktop\cern open-data\cernopendata-portal\env\lib\site-packages (from check-manifest) (65.5.0) +Collecting gevent>=1.2.2 (from locustio>=0.8) + Obtaining dependency information for gevent>=1.2.2 from https://files.pythonhosted.org/packages/37/ed/58dbe9fb09d36f6477ff8db0459ebd3be9a77dc05ae5d96dc91ad657610d/gevent-24.11.1-cp311-cp311-win_amd64.whl.metadata + Downloading gevent-24.11.1-cp311-cp311-win_amd64.whl.metadata (13 kB) +Collecting flask>=0.10.1 (from locustio>=0.8) + Obtaining dependency information for flask>=0.10.1 from https://files.pythonhosted.org/packages/af/47/93213ee66ef8fae3b93b3e29206f6b251e65c97bd91d8e1c5596ef15af0a/flask-3.1.0-py3-none-any.whl.metadata + Downloading flask-3.1.0-py3-none-any.whl.metadata (2.7 kB) +Collecting requests>=2.9.1 (from locustio>=0.8) + Obtaining dependency information for requests>=2.9.1 from https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl.metadata + Using cached requests-2.32.3-py3-none-any.whl.metadata (4.6 kB) +Collecting msgpack-python>=0.4.2 (from locustio>=0.8) + Downloading msgpack-python-0.5.6.tar.gz (138 kB) + -------------------------------------- 139.0/139.0 kB 4.2 MB/s eta 0:00:00 + Installing build dependencies: started + Installing build dependencies: finished with status 'done' + Getting requirements to build wheel: started + Getting requirements to build wheel: finished with status 'done' + Preparing metadata (pyproject.toml): started + Preparing metadata (pyproject.toml): finished with status 'done' +Collecting six>=1.10.0 (from locustio>=0.8) + Obtaining dependency information for six>=1.10.0 from https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl.metadata + Downloading six-1.17.0-py2.py3-none-any.whl.metadata (1.7 kB) +Collecting pyzmq>=16.0.2 (from locustio>=0.8) + Obtaining dependency information for pyzmq>=16.0.2 from https://files.pythonhosted.org/packages/3b/1b/0a540edd75a41df14ec416a9a500b9fec66e554aac920d4c58fbd5756776/pyzmq-26.2.0-cp311-cp311-win_amd64.whl.metadata + Downloading pyzmq-26.2.0-cp311-cp311-win_amd64.whl.metadata (6.2 kB) +Collecting geventhttpclient-wheels==1.3.1.dev2 (from locustio>=0.8) + Downloading geventhttpclient-wheels-1.3.1.dev2.tar.gz (54 kB) + ---------------------------------------- 54.3/54.3 kB 2.8 MB/s eta 0:00:00 + Installing build dependencies: started + Installing build dependencies: finished with status 'done' + Getting requirements to build wheel: started + Getting requirements to build wheel: finished with status 'done' + Preparing metadata (pyproject.toml): started + Preparing metadata (pyproject.toml): finished with status 'done' +Collecting certifi (from geventhttpclient-wheels==1.3.1.dev2->locustio>=0.8) + Obtaining dependency information for certifi from https://files.pythonhosted.org/packages/a5/32/8f6669fc4798494966bf446c8c4a162e0b5d893dff088afddf76414f70e1/certifi-2024.12.14-py3-none-any.whl.metadata + Using cached certifi-2024.12.14-py3-none-any.whl.metadata (2.3 kB) +Collecting pyproject_hooks (from build>=0.1->check-manifest) + Obtaining dependency information for pyproject_hooks from https://files.pythonhosted.org/packages/bd/24/12818598c362d7f300f18e74db45963dbcb85150324092410c8b49405e42/pyproject_hooks-1.2.0-py3-none-any.whl.metadata + Downloading pyproject_hooks-1.2.0-py3-none-any.whl.metadata (1.3 kB) +Collecting Werkzeug>=3.1 (from flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for Werkzeug>=3.1 from https://files.pythonhosted.org/packages/52/24/ab44c871b0f07f491e5d2ad12c9bd7358e527510618cb1b803a88e986db1/werkzeug-3.1.3-py3-none-any.whl.metadata + Downloading werkzeug-3.1.3-py3-none-any.whl.metadata (3.7 kB) +Collecting Jinja2>=3.1.2 (from flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for Jinja2>=3.1.2 from https://files.pythonhosted.org/packages/bd/0f/2ba5fbcd631e3e88689309dbe978c5769e883e4b84ebfe7da30b43275c5a/jinja2-3.1.5-py3-none-any.whl.metadata + Downloading jinja2-3.1.5-py3-none-any.whl.metadata (2.6 kB) +Collecting itsdangerous>=2.2 (from flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for itsdangerous>=2.2 from https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl.metadata + Using cached itsdangerous-2.2.0-py3-none-any.whl.metadata (1.9 kB) +Collecting click>=8.1.3 (from flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for click>=8.1.3 from https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl.metadata + Downloading click-8.1.8-py3-none-any.whl.metadata (2.3 kB) +Collecting blinker>=1.9 (from flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for blinker>=1.9 from https://files.pythonhosted.org/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl.metadata + Downloading blinker-1.9.0-py3-none-any.whl.metadata (1.6 kB) +Collecting zope.event (from gevent>=1.2.2->locustio>=0.8) + Obtaining dependency information for zope.event from https://files.pythonhosted.org/packages/fe/42/f8dbc2b9ad59e927940325a22d6d3931d630c3644dae7e2369ef5d9ba230/zope.event-5.0-py3-none-any.whl.metadata + Downloading zope.event-5.0-py3-none-any.whl.metadata (4.4 kB) +Collecting zope.interface (from gevent>=1.2.2->locustio>=0.8) + Obtaining dependency information for zope.interface from https://files.pythonhosted.org/packages/a7/2c/82028f121d27c7e68632347fe04f4a6e0466e77bb36e104c8b074f3d7d7b/zope.interface-7.2-cp311-cp311-win_amd64.whl.metadata + Downloading zope.interface-7.2-cp311-cp311-win_amd64.whl.metadata (45 kB) + ---------------------------------------- 45.6/45.6 kB ? eta 0:00:00 +Collecting greenlet>=3.1.1 (from gevent>=1.2.2->locustio>=0.8) + Obtaining dependency information for greenlet>=3.1.1 from https://files.pythonhosted.org/packages/12/da/b9ed5e310bb8b89661b80cbcd4db5a067903bbcd7fc854923f5ebb4144f0/greenlet-3.1.1-cp311-cp311-win_amd64.whl.metadata + Downloading greenlet-3.1.1-cp311-cp311-win_amd64.whl.metadata (3.9 kB) +Collecting cffi>=1.17.1 (from gevent>=1.2.2->locustio>=0.8) + Obtaining dependency information for cffi>=1.17.1 from https://files.pythonhosted.org/packages/3d/97/50228be003bb2802627d28ec0627837ac0bf35c90cf769812056f235b2d1/cffi-1.17.1-cp311-cp311-win_amd64.whl.metadata + Downloading cffi-1.17.1-cp311-cp311-win_amd64.whl.metadata (1.6 kB) +Collecting charset-normalizer<4,>=2 (from requests>=2.9.1->locustio>=0.8) + Obtaining dependency information for charset-normalizer<4,>=2 from https://files.pythonhosted.org/packages/1e/ab/45b180e175de4402dcf7547e4fb617283bae54ce35c27930a6f35b6bef15/charset_normalizer-3.4.1-cp311-cp311-win_amd64.whl.metadata + Using cached charset_normalizer-3.4.1-cp311-cp311-win_amd64.whl.metadata (36 kB) +Collecting idna<4,>=2.5 (from requests>=2.9.1->locustio>=0.8) + Obtaining dependency information for idna<4,>=2.5 from https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl.metadata + Using cached idna-3.10-py3-none-any.whl.metadata (10 kB) +Collecting urllib3<3,>=1.21.1 (from requests>=2.9.1->locustio>=0.8) + Obtaining dependency information for urllib3<3,>=1.21.1 from https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl.metadata + Using cached urllib3-2.3.0-py3-none-any.whl.metadata (6.5 kB) +Collecting pycparser (from cffi>=1.17.1->gevent>=1.2.2->locustio>=0.8) + Obtaining dependency information for pycparser from https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl.metadata + Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes) +Collecting MarkupSafe>=2.0 (from Jinja2>=3.1.2->flask>=0.10.1->locustio>=0.8) + Obtaining dependency information for MarkupSafe>=2.0 from https://files.pythonhosted.org/packages/da/b8/3a3bd761922d416f3dc5d00bfbed11f66b1ab89a0c2b6e887240a30b0f6b/MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl.metadata + Downloading MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl.metadata (4.1 kB) +Downloading pytest-7.4.4-py3-none-any.whl (325 kB) + ---------------------------------------- 325.3/325.3 kB 2.5 MB/s eta 0:00:00 +Downloading pytest_cov-4.1.0-py3-none-any.whl (21 kB) +Downloading beautifulsoup4-4.12.3-py3-none-any.whl (147 kB) + ---------------------------------------- 147.9/147.9 kB 2.9 MB/s eta 0:00:00 +Downloading pydocstyle-6.3.0-py3-none-any.whl (38 kB) +Downloading pycodestyle-2.12.1-py2.py3-none-any.whl (31 kB) +Downloading isort-5.13.2-py3-none-any.whl (92 kB) + ---------------------------------------- 92.3/92.3 kB 5.1 MB/s eta 0:00:00 +Downloading coverage-7.6.10-cp311-cp311-win_amd64.whl (211 kB) + ---------------------------------------- 211.5/211.5 kB 3.2 MB/s eta 0:00:00 +Downloading check_manifest-0.50-py3-none-any.whl (20 kB) +Downloading locustio-0.12.2-py2.py3-none-any.whl (251 kB) + ---------------------------------------- 252.0/252.0 kB 3.8 MB/s eta 0:00:00 +Downloading mock-5.1.0-py3-none-any.whl (30 kB) +Downloading build-1.2.2.post1-py3-none-any.whl (22 kB) +Downloading execnet-2.1.1-py3-none-any.whl (40 kB) + ---------------------------------------- 40.6/40.6 kB 1.9 MB/s eta 0:00:00 +Downloading flask-3.1.0-py3-none-any.whl (102 kB) + ---------------------------------------- 103.0/103.0 kB 2.9 MB/s eta 0:00:00 +Downloading gevent-24.11.1-cp311-cp311-win_amd64.whl (1.5 MB) + ---------------------------------------- 1.5/1.5 MB 3.8 MB/s eta 0:00:00 +Downloading packaging-24.2-py3-none-any.whl (65 kB) + ---------------------------------------- 65.5/65.5 kB 3.5 MB/s eta 0:00:00 +Downloading pluggy-1.5.0-py3-none-any.whl (20 kB) +Downloading pyzmq-26.2.0-cp311-cp311-win_amd64.whl (642 kB) + ---------------------------------------- 642.3/642.3 kB 1.8 MB/s eta 0:00:00 +Using cached requests-2.32.3-py3-none-any.whl (64 kB) +Downloading six-1.17.0-py2.py3-none-any.whl (11 kB) +Downloading snowballstemmer-2.2.0-py2.py3-none-any.whl (93 kB) + ---------------------------------------- 93.0/93.0 kB 2.7 MB/s eta 0:00:00 +Downloading soupsieve-2.6-py3-none-any.whl (36 kB) +Using cached colorama-0.4.6-py2.py3-none-any.whl (25 kB) +Downloading iniconfig-2.0.0-py3-none-any.whl (5.9 kB) +Downloading blinker-1.9.0-py3-none-any.whl (8.5 kB) +Using cached certifi-2024.12.14-py3-none-any.whl (164 kB) +Downloading cffi-1.17.1-cp311-cp311-win_amd64.whl (181 kB) + ---------------------------------------- 181.4/181.4 kB 3.6 MB/s eta 0:00:00 +Using cached charset_normalizer-3.4.1-cp311-cp311-win_amd64.whl (102 kB) +Downloading click-8.1.8-py3-none-any.whl (98 kB) + ---------------------------------------- 98.2/98.2 kB 2.8 MB/s eta 0:00:00 +Downloading greenlet-3.1.1-cp311-cp311-win_amd64.whl (298 kB) + ---------------------------------------- 298.9/298.9 kB 3.7 MB/s eta 0:00:00 +Using cached idna-3.10-py3-none-any.whl (70 kB) +Using cached itsdangerous-2.2.0-py3-none-any.whl (16 kB) +Downloading jinja2-3.1.5-py3-none-any.whl (134 kB) + ---------------------------------------- 134.6/134.6 kB 2.0 MB/s eta 0:00:00 +Using cached urllib3-2.3.0-py3-none-any.whl (128 kB) +Downloading werkzeug-3.1.3-py3-none-any.whl (224 kB) + ---------------------------------------- 224.5/224.5 kB 4.6 MB/s eta 0:00:00 +Downloading pyproject_hooks-1.2.0-py3-none-any.whl (10 kB) +Downloading zope.event-5.0-py3-none-any.whl (6.8 kB) +Downloading zope.interface-7.2-cp311-cp311-win_amd64.whl (212 kB) + ---------------------------------------- 212.3/212.3 kB 4.3 MB/s eta 0:00:00 +Downloading MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl (15 kB) +Using cached pycparser-2.22-py3-none-any.whl (117 kB) +Building wheels for collected packages: pytest-cache, geventhttpclient-wheels, msgpack-python + Building wheel for pytest-cache (pyproject.toml): started + Building wheel for pytest-cache (pyproject.toml): finished with status 'done' + Created wheel for pytest-cache: filename=pytest_cache-1.0-py3-none-any.whl size=7008 sha256=852334fb954aefadb822b36607111cfaad36ab02c648df308e4002c1a5735865 + Stored in directory: c:\users\yuvra\appdata\local\pip\cache\wheels\c4\ca\a9\c21a63dad8d4d93f6db562384b08686ba844f633c1bbbd9680 + Building wheel for geventhttpclient-wheels (pyproject.toml): started + Building wheel for geventhttpclient-wheels (pyproject.toml): finished with status 'error' + Building wheel for msgpack-python (pyproject.toml): started + Building wheel for msgpack-python (pyproject.toml): finished with status 'done' + Created wheel for msgpack-python: filename=msgpack_python-0.5.6-cp311-cp311-win_amd64.whl size=10452 sha256=ae450e73df1887c5c559fd78ce9206018f7e48613c8876017b6bf722da6788ec + Stored in directory: c:\users\yuvra\appdata\local\pip\cache\wheels\43\f2\d5\7f46f06bd7517865d92876b0e5f627ce8eacc03bf5b8f495c6 +Successfully built pytest-cache msgpack-python +Failed to build geventhttpclient-wheels diff --git a/=2.4.0 b/=2.4.0 new file mode 100644 index 0000000..e69de29 diff --git a/=4.0 b/=4.0 new file mode 100644 index 0000000..e69de29 diff --git a/=4.2.2 b/=4.2.2 new file mode 100644 index 0000000..e69de29 diff --git a/cernopendata/jsonschemas/records/record-v1.0.0.json b/cernopendata/jsonschemas/records/record-v1.0.0.json index bb8ddde..c318818 100644 --- a/cernopendata/jsonschemas/records/record-v1.0.0.json +++ b/cernopendata/jsonschemas/records/record-v1.0.0.json @@ -272,7 +272,10 @@ "description": "Specifies if dataset is on-demand, online in future might be also tape, disk", "enum": [ "ondemand", - "online" + "online", + "available", + "sample available", + "needs to be requested" ], "type": "string" }, diff --git a/cernopendata/modules/fixtures/cli.py b/cernopendata/modules/fixtures/cli.py index da8c2a5..c32f56e 100644 --- a/cernopendata/modules/fixtures/cli.py +++ b/cernopendata/modules/fixtures/cli.py @@ -51,6 +51,8 @@ MODE_OPTIONS = ["insert", "replace", "insert-or-replace", "insert-or-skip"] +import logging +logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(message)s") def get_jsons_from_dir(dir): """Get JSON files inside a dir.""" @@ -78,14 +80,10 @@ def _handle_record_files(record, data): filename = file.get("uri").split("/")[-1:][0] f.set_uri(file.get("uri"), file.get("size"), file.get("checksum")) if "type" in file and file["type"] == "index.json": - print( - datetime.now(), - "This is an index file. Let's check the entries that it has:", - file.get("uri"), - ) + logging.info("Processing index file: %s",file.get("uri")) # We don't need to store the index FileIndexMetadata.create(record, f) - print("File index created") + logging.info("File index created") f.delete() elif "type" in file and file["type"] == "index.txt": # The txt indexes should be ignored. Just delete the file @@ -102,11 +100,11 @@ def _handle_record_files(record, data): } file.update(file_info) except Exception as e: - click.secho( - "Recid {0} file {1} could not be loaded due " - "to {2}.".format(data.get("recid"), filename, str(e)), - fg="red", - err=True, + logging.error( + "Recid %s file %s could not be loaded due to %s ", + data.get("recid", "Unknown Recid"), + filename, + str(e), ) record["files"] = real_files data["files"] = real_files diff --git a/setup.py b/setup.py index c9fa4c0..bb69ba9 100644 --- a/setup.py +++ b/setup.py @@ -112,8 +112,8 @@ "python-markdown-math>=0.3", "python-slugify>=1.2.4", # Webserver - "uWSGI>=2.0.21", - "uwsgitop>=0.11", + #"uWSGI>=2.0.21", + #"uwsgitop>=0.11", # Pin SQLAlchemy version due to sqlalchemy-utils compatibility # "sqlalchemy-continuum==1.4.1",