Skip to content

Commit

Permalink
global: upgrade to v13
Browse files Browse the repository at this point in the history
  • Loading branch information
mb-wali authored Oct 23, 2024
2 parents 24c6766 + d2cac30 commit 5969ed4
Show file tree
Hide file tree
Showing 26 changed files with 2,142 additions and 1,804 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ data/default/*
data/.minio.sys

# Celery
celerybeat-schedule.db
celerybeat-schedule
33 changes: 16 additions & 17 deletions .invenio
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,33 @@ project_name = instance
project_shortname = instance
package_name = instance
project_site = instance.com
github_repo = instance/instance
description = instance InvenioRDM Instance
author_name = CERN
author_email = [email protected]
year = 2024
database = postgresql
search = opensearch2
file_storage = local
development_tools = yes
site_code = no
site_code = yes
use_reduced_vocabs = no
_template = https://github.com/inveniosoftware/cookiecutter-invenio-rdm
_output_dir = /home/omen/projects/tugraz/sharedrdm/instance
_output_dir = /home/omen/projects/tug/cyverse/github/cyverse.at

[files]
dockerfile = 44e5c207cf3e82cddda086f73e6fa5f3bacfc06d11f55a95f954d744a773c605
.gitignore = af1182c70588e583daeb35809e6cdfe3408425d438c3ceb282b1f4b8360290e2
pipfile = ecd28cb043f8b57107877b3865fd7e5e4484c3f83d03c6ee9082221bd5d1a4a4
app_data = {'vocabularies': {'languages.yaml': 'd3bdb59940e8e6cd2401785ad55733f5fc6a1fb0bb0a2005a8fe4e5148e5f286', 'affiliations_ror.yaml': '2e913fbecacd3694cba1b9a10739164911c2d45db3b32f1cb923027c48e0ac3e', 'names.yaml': '5bed6786526d6fea44828c19ded1e45f1892aae5d6be747f0ff79fc880ce535b', 'cc_licences.csv': '19a8bfd2488c7adb90d1dbe1c70f57cf2e0a737cb11814cc814f917072843de7', 'subjects_oecd_fos.yaml': 'eef38714c506d956193c3be17e6004049525d252bf22424f4804dfc1ad46db44'}, 'pages': {'.gitkeep': '22818f8c9f68fb11b7ca893ad1c082f844ae9f691f082d2174e32738d9ae6114'}, 'README.md': 'd58978488626bdeddc791a15a39e341a4ed06f202b84d0c0d4aa9ef49481c6d9', 'vocabularies.yaml': 'dd56a900bca7b15b33bc6ebb46079f355528eb500910d7c882f7f215c36c695b'}
docker-compose.yml = 4751e900e590f0e93925cedf9ec0141042f6045333c7846c23758a822dc928d9
docker = {'nginx': {'Dockerfile': '541326766beaba2e8492255c99e11aa76640d71329ceab5bcab1c8d6a979bd5c', 'test.crt': '2ccf196bab5cfea25734c452933fad3959dc70d66aff76f9905d857ea4b79ce9', 'nginx.conf': '6c9a6e372fc340dfcd3b49e6a30bd7bd36af41d79d1d093b7b3ba5f4c9d781b4', 'conf.d': {'default.conf': '2501758a42cfeb912052daa5921dfb3bc38042ee97ce1f64ae1d0658f7fbedbd'}, 'test.key': '0aadd7cf68357d0ea4ea2dac6d94606e1ee3ead9e91a53cb96f88396dd490579'}, 'uwsgi': {'uwsgi_rest.ini': 'c36fc5021baf15f375b3b6c825f7753e5d166319c5fe38a85b604391ce5b37b6', 'uwsgi_ui.ini': 'aeb0797a1fadb462e0ed208c979d5152cc58a85958d4de9c4e989637c70b9005'}, 'pgadmin': {'servers.json': 'dee9384f2d7ad82102e5b9b4507c1881e64bb0b4a65a8583bad4ccedf7274b30'}}
.dockerignore = 21241bc12cdf4ac5f209d6b191adc8f25eb89af93ce5c4c3f72c86661162d7b5
docker-compose.yml = 2073d3075bb72b287e0d700ad7f798c27ff2bad57bd41613fc29391b761665d9
docker = {'uwsgi': {'uwsgi_ui.ini': 'aeb0797a1fadb462e0ed208c979d5152cc58a85958d4de9c4e989637c70b9005', 'uwsgi_rest.ini': 'c36fc5021baf15f375b3b6c825f7753e5d166319c5fe38a85b604391ce5b37b6'}, 'pgadmin': {'servers.json': 'dee9384f2d7ad82102e5b9b4507c1881e64bb0b4a65a8583bad4ccedf7274b30'}, 'nginx': {'test.key': 'd7665064ff09527a563ee28fe71597b7f69041b86a3113f9444b975e522776da', 'conf.d': {'default.conf': '732bdcce7677169820b28d8571779ee2f7837dfe9f8c0005584a44215fc1945c'}, 'nginx.conf': '6c9a6e372fc340dfcd3b49e6a30bd7bd36af41d79d1d093b7b3ba5f4c9d781b4', 'test.crt': 'aa71982491284e34d30748e292ed3fc91e0738a498b1a0dbdb0687248d24bb76', 'Dockerfile': '541326766beaba2e8492255c99e11aa76640d71329ceab5bcab1c8d6a979bd5c'}}
pipfile = b81df9c4d6e43a640236a3ec6b6d3165b213ed3a5bd404f35b9ee39fce3b408b
readme.md = 263db13ed00fca40341d2fc7071dbdaf4f4fe0b33efafaac4924cc954528f4f6
templates = {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}
static = {'images': {'invenio-rdm.svg': '50f09b4d83244a69c58f44aa436a3fa097726d9b47fd0e0782ea92d31f854b65', 'logo-invenio-white.svg': '5af2c7b67a09798cba3d50cc2e811ca9fd2ff73b40d9d2a52a97237b9ed44008'}, 'robots.txt': 'bb37b06b33e7d97f41aef939f8ef3052898c7f6d6fdfc7c9d37b6d0605c86ff3'}
assets = {'templates': {'search': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}, 'custom_fields': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}}, 'less': {'theme.config': 'ee68441b779400585a3a1ed4445ab5727e3a47a09aa708976dd506c0e081f0d8', 'site': {'globals': {'site.overrides': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855', 'site.variables': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'}}}, 'js': {'invenio_app_rdm': {'overridableRegistry': {'mapping.js': '7fb63c1b801d11f1c1bb9b7d5cad6662ae475210df2bbba6919cda402684590a'}}}}
invenio.cfg = 100a726635a632032cf71cf23ee65d8243b8e50263b26f959a3b949399f78f9a
.gitignore = af1182c70588e583daeb35809e6cdfe3408425d438c3ceb282b1f4b8360290e2
docker-services.yml = 266886cb2a5bb8bbb41929bcf11a2c1941ac26ea32bf4343e8ee98ddc577f325
docker-compose.full.yml = 44e0857356262f32bafcc544e14185219fd5c679b4ba7022e901e5ffc691e874
app_data = {'pages': {'.gitkeep': '22818f8c9f68fb11b7ca893ad1c082f844ae9f691f082d2174e32738d9ae6114'}, 'README.md': 'd58978488626bdeddc791a15a39e341a4ed06f202b84d0c0d4aa9ef49481c6d9', 'vocabularies.yaml': 'e860d2136df803dc05e67c8f1c32bc58aa4bdca348dcc2daf7aaa4aee67ecfbf', 'vocabularies': {'cc_licences.csv': '19a8bfd2488c7adb90d1dbe1c70f57cf2e0a737cb11814cc814f917072843de7', 'languages.yaml': 'd3bdb59940e8e6cd2401785ad55733f5fc6a1fb0bb0a2005a8fe4e5148e5f286', 'names.yaml': '6dc80984186ec960bcf53fbb6c482554d0aaf386d345bf82f504fdbd896e5848', 'subjects_oecd_fos.yaml': 'eef38714c506d956193c3be17e6004049525d252bf22424f4804dfc1ad46db44'}}
dockerfile = 44e5c207cf3e82cddda086f73e6fa5f3bacfc06d11f55a95f954d744a773c605
site = {'tests': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}, 'instance': {'webpack.py': '9a69dfe14f1770b25bc02395675065faad7f63efb83e3153f0265499144e7716', 'templates': {'semantic-ui': {'instance': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}}}, 'views.py': 'f5b37a3dc13adf2aef5c0d0af0dcb6ebecabd174761a5acf2fcc5a1d0f69ddaf', 'assets': {'semantic-ui': {'less': {'instance': {'.gitkeep': 'de96a61fec5b6b168bced6dda58bd11e353f618ae9bee45aad9253cb0d6c5617'}}, 'js': {'instance': {'.gitkeep': '3253a6fe7fc74a1279fb374e67ffd3383eded63cd28c4877afd77dffc8cc5da4'}}}}, '__init__.py': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'}, 'setup.cfg': 'd151a1b88e5f9e72c3c0cb14c2db11384e62115db201af4df557200215f075b3', 'setup.py': '843ac26c38a41abae578250bc0f9419194b320a0f67327d941037a4268f6cfe7', 'pyproject.toml': 'e1acd833b38f03f26cc31439246cbeeb82e2edf56c751f28c3247cb44e95caca', '.gitkeep': '43db68dd2e00f0129e4e26f268c31f932adf79a534cafcb1b132e5158cc4492b'}
translations = {'babel.ini': '3fb6bff73460aa031d4f90fc1e1d16235cab84d2385c9831efacb2ce32e5409b'}
static = {'images': {'logo-invenio-white.svg': '5af2c7b67a09798cba3d50cc2e811ca9fd2ff73b40d9d2a52a97237b9ed44008', 'invenio-rdm.svg': '50f09b4d83244a69c58f44aa436a3fa097726d9b47fd0e0782ea92d31f854b65'}, 'robots.txt': 'bb37b06b33e7d97f41aef939f8ef3052898c7f6d6fdfc7c9d37b6d0605c86ff3'}
docker-compose.full.yml = 1b8a649610e1f15472b65dc95957058c3416459f302d6382cde1578200c56be1
readme.md = 6aa571729ed435689c11ed598ab7f340575ea111b2ff7cede8af7d211106518e
docker-services.yml = 154bba07119f856e39d49120fd6735ced1dba6e0e68d226980e66872c069e88d
assets = {'templates': {'custom_fields': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}, 'search': {'.gitkeep': 'd4756cdf68d94c670c924f9d57d44718f666e457727701486435b57a97e52c5f'}}, 'less': {'site': {'globals': {'site.overrides': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855', 'site.variables': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'}}, 'theme.config': 'ee68441b779400585a3a1ed4445ab5727e3a47a09aa708976dd506c0e081f0d8'}, 'js': {'invenio_app_rdm': {'overridableRegistry': {'mapping.js': '7fb63c1b801d11f1c1bb9b7d5cad6662ae475210df2bbba6919cda402684590a'}}}}
.dockerignore = 21241bc12cdf4ac5f209d6b191adc8f25eb89af93ce5c4c3f72c86661162d7b5
invenio.cfg = debe49c59d69ebbc37ff5d10daa3358fa96dd8cbd86fb7fd3df1ef4f3d170c3d

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

FROM registry.cern.ch/inveniosoftware/almalinux:1

# COPY site ./site
COPY site ./site
COPY Pipfile Pipfile.lock ./
RUN pipenv install --deploy --system

Expand Down
15 changes: 3 additions & 12 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,13 @@ verify_ssl = true
check-manifest = ">=0.25"

[packages]
invenio-app-rdm = {extras = ["postgresql", "opensearch2"], version = "~=12.0.0b2.dev66"}
invenio-app-rdm = {extras = ["opensearch2"], version = "~=13.0.0b1.dev0"}
instance = {editable = true, path="./site"}

uwsgi = ">=2.0"
uwsgitop = ">=0.11"
uwsgi-tools = ">=1.1.1"


# openssl problem
# ImportError: urllib3 v2.0 only supports OpenSSL 1.1.1+, currently
# the 'ssl' module is compiled with 'OpenSSL 1.0.2k-fips 26 Jan 2017'.
# See: https://github.com/urllib3/urllib3/issues/2168
urllib3 = "<2.0.0"

# to be save, until all deprecation warnings are fixed
flask = "<2.3.0"
werkzeug = "<2.3.0"

[requires]
python_version = "3.9"

Expand Down
Loading

0 comments on commit 5969ed4

Please sign in to comment.