From 7b08f252f3132b70959075be2e527bea303ec12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sat, 5 Oct 2024 03:00:42 +0200 Subject: [PATCH 01/14] silence yarn --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4753e8f1..6788c5a1 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,7 @@ distclean: clean yarn: - export PUPPETEER_SKIP_CHROME_DOWNLOAD=true PUPPETEER_SKIP_CHROME_HEADLESS_SHELL_DOWNLOAD=true && yarn cache clean && yarn install - # yarn install # --no-progress --emoji false -s + export PUPPETEER_SKIP_CHROME_DOWNLOAD=true PUPPETEER_SKIP_CHROME_HEADLESS_SHELL_DOWNLOAD=true && yarn install --no-progress --emoji false -s grunt-build: grunt build From 709999c2244aae9a6ead4f2bae8e2b9f4b93d9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sat, 5 Oct 2024 03:04:14 +0200 Subject: [PATCH 02/14] Odznaka dockera --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index 4af97ee4..d1b2ae9d 100644 --- a/README.rst +++ b/README.rst @@ -7,6 +7,9 @@ :align: center :alt: Logo projektu +.. image:: https://github.com/iplweb/bpp/actions/workflows/build.yml/badge.svg + :targer: https://github.com/iplweb/bpp/actions/workflows/build.yml + .. image:: https://circleci.com/gh/iplweb/bpp/tree/dev.svg?style=svg :target: https://circleci.com/gh/iplweb/bpp From 543bb7f8fae0b5a91687c2f5056f96dcd50ed992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 18:59:07 +0200 Subject: [PATCH 03/14] Fix CI --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 361f7d75..6016ab47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,12 +103,6 @@ jobs: command: | poetry run src/manage.py migrate - - run: - name: Fix yarn on CI maybe - command: | - sudo yarn global add n - sudo n 16.19.0 - - run: name: make assets command: | From b1ecd9abe1053e7f49621b37c5e79c1c1e78a897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 19:13:47 +0200 Subject: [PATCH 04/14] Fix JS tests on CI, maybe --- .circleci/config.yml | 16 +++++++++++++--- Makefile | 5 ++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6016ab47..3fafbcdd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -302,12 +302,22 @@ jobs: name: Recreate db command: cat pg_dump.sql | psql bpp + - run: + name: Zainstaluj pakiety JavaScript + command: poetry run make yarn + + # Doinstaluj explicte Chrome; normalnie przy 'yarn install' okazuje + # sie, ze apka 'puppeteer' nie jest w stanie go pobrac bo jest timeout; + # tutaj explicte instalujemy chrome, zeby widziec, gdzie i kiedy szlag + # trafia tą instalajce... + - run: + name: Instaluj Chrome dla JS testow + command: npx puppeteer browsers install chrome + # Testy JavaScript - run: name: JS Tests - command: | - poetry run make yarn - poetry run make js-tests + command: poetry run make js-tests coveralls: docker: diff --git a/Makefile b/Makefile index 6788c5a1..79e66ce2 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,10 @@ bdist_wheel: distclean production-assets compilemessages upload: twine upload dist/*whl -js-tests: assets +puppeteer-install-chrome: + npx puppeteer browsers install chrome + +js-tests: assets puppeteer-install-chrome grunt qunit # cel: live-docs From 8f0f47ac5f2282d57e3f78e4e93d44f9786e6004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 19:14:25 +0200 Subject: [PATCH 05/14] Enable cache again --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3fafbcdd..461c292e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,8 +66,8 @@ jobs: - checkout -# - restore_cache: -# key: cache-15-{{ checksum "poetry.lock" }}-{{ checksum "yarn.lock" }} + - restore_cache: + key: cache-15-{{ checksum "poetry.lock" }}-{{ checksum "yarn.lock" }} - run: sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - run: wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - @@ -114,10 +114,10 @@ jobs: # ls -las /home/circleci/.cache # ls -las /home/circleci/.cache/*poetry*/ -# - save_cache: -# key: cache-15-{{ checksum "poetry.lock" }}-{{ checksum "yarn.lock" }} -# paths: -# - "/home/circleci/.cache" + - save_cache: + key: cache-15-{{ checksum "poetry.lock" }}-{{ checksum "yarn.lock" }} + paths: + - "/home/circleci/.cache" # Stworz dump bazy danych na potrzeby kolejnych kroków - run: From fcbd4a906d7c702b4017094d255fc32b6fc1c46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 19:48:43 +0200 Subject: [PATCH 06/14] =?UTF-8?q?Uwzgl=C4=99dniaj=20src/../.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/django_bpp/settings/base.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/django_bpp/settings/base.py b/src/django_bpp/settings/base.py index 807f77ff..fa15ee01 100644 --- a/src/django_bpp/settings/base.py +++ b/src/django_bpp/settings/base.py @@ -20,6 +20,8 @@ SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__)) +SITE_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..")) + SECRET_KEY_UNSET = "Please set the DJANGO_BPP_SECRET_KEY variable." # Ponieważ konieczna jest konfiguracja django-ldap-auth i potrzebne będą kolejne zmienne @@ -119,14 +121,27 @@ STATIC_ROOT=(str, os.path.abspath(os.path.join(SCRIPT_PATH, "..", "staticroot"))), ) -ENVFILE_PATH = os.path.join(os.path.expanduser("~"), ".env") +ENVFILE_PATHS = [] + +# +# Jeżeli NIE działąmy z site-packages, to prawdopodobnie działamy ze źródeł; w tej sytuacji skorzystaj z +# pliku .env w głównym katalogu repozytorium: +# +if "site-packages" not in __file__: + ENVFILE_SOURCEDIR = os.path.abspath(os.path.join(SITE_ROOT, "..", ".env")) + ENVFILE_PATHS.append(ENVFILE_SOURCEDIR) # -# Odczytaj plik ~/.env oraz dodatkowo ~/.env.local ; -# jeżeli zmienna jest zdefiniowana w tym drugim to nadpisz ten pierwszy... +# Kolejny plik w kolejności to plik w katalogu $HOME/.env oraz $HOME/.env.local: # +ENVFILE_HOMEDIR = os.path.abspath(os.path.join(os.path.expanduser("~"), ".env")) +ENVFILE_PATHS.append(ENVFILE_HOMEDIR) +ENVFILE_PATHS.append(ENVFILE_HOMEDIR + ".local") -for fn in [ENVFILE_PATH, ENVFILE_PATH + ".local"]: +# Jeżeli zmienna jest zdefiniowana w więcej, niż jednym pliku to zmienna będzie nadpisana +# w kolejności plików: + +for fn in ENVFILE_PATHS: if os.path.exists(fn) and os.path.isfile(fn): environ.Env.read_env(fn, overwrite=True) @@ -430,8 +445,6 @@ def autoslug_gen(): MAT_VIEW_REFRESH_COUNTDOWN = 30 -SITE_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..")) - STATIC_ROOT = env("STATIC_ROOT") COMPRESS_CSS_FILTERS = [ @@ -937,7 +950,6 @@ def can_login_as(request, target_user): " została wyłączona" ) - # # Koniec konfiguracji django-microsoft-auth # From da77fef7e63142c136b24faa02775fb1998cc7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 20:30:46 +0200 Subject: [PATCH 07/14] =?UTF-8?q?Szybsze=20generowanie=20XLS=20w=20raport?= =?UTF-8?q?=20slot=C3=B3w=20-=20ewaluacja?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bpp/newsfragments/+faa6dfa4.bugfix.rst | 2 ++ src/raport_slotow/tests/conftest.py | 28 +++++++++++++--------- src/raport_slotow/tests/test_ewaluacja.py | 19 ++++++++++++--- src/raport_slotow/views/ewaluacja.py | 10 ++++++++ 4 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 src/bpp/newsfragments/+faa6dfa4.bugfix.rst diff --git a/src/bpp/newsfragments/+faa6dfa4.bugfix.rst b/src/bpp/newsfragments/+faa6dfa4.bugfix.rst new file mode 100644 index 00000000..1b8d223a --- /dev/null +++ b/src/bpp/newsfragments/+faa6dfa4.bugfix.rst @@ -0,0 +1,2 @@ + +szybsze generowanie XLSa w raport slotów - ewaluacja diff --git a/src/raport_slotow/tests/conftest.py b/src/raport_slotow/tests/conftest.py index 7d304197..ad57ee9a 100644 --- a/src/raport_slotow/tests/conftest.py +++ b/src/raport_slotow/tests/conftest.py @@ -6,36 +6,42 @@ from bpp.models import Cache_Punktacja_Autora_Query, Cache_Punktacja_Dyscypliny, Rekord -@pytest.mark.django_db -@pytest.fixture -def rekord_slotu( - autor_jan_kowalski, jednostka, dyscyplina1, wydawnictwo_ciagle_z_autorem, rok -): - wydawnictwo_ciagle_z_autorem.autorzy_set.update(dyscyplina_naukowa=dyscyplina1) +def _rekord_slotu_maker(autor, jednostka, dyscyplina, wydawnictwo_ciagle, rok): + wydawnictwo_ciagle.autorzy_set.update(dyscyplina_naukowa=dyscyplina) - rekord = Rekord.objects.get_for_model(wydawnictwo_ciagle_z_autorem) + rekord = Rekord.objects.get_for_model(wydawnictwo_ciagle) Cache_Punktacja_Dyscypliny.objects.create( rekord_id=rekord.pk, - dyscyplina=dyscyplina1, + dyscyplina=dyscyplina, pkd=50, slot=20, autorzy_z_dyscypliny=[ - autor_jan_kowalski.pk, + autor.pk, ], zapisani_autorzy_z_dyscypliny=[ "Foo", ], ) return Cache_Punktacja_Autora_Query.objects.create( - autor=autor_jan_kowalski, + autor=autor, jednostka=jednostka, - dyscyplina=dyscyplina1, + dyscyplina=dyscyplina, pkdaut=50, slot=20, rekord=rekord, ) +@pytest.mark.django_db +@pytest.fixture +def rekord_slotu( + autor_jan_kowalski, jednostka, dyscyplina1, wydawnictwo_ciagle_z_autorem, rok +): + return _rekord_slotu_maker( + autor_jan_kowalski, jednostka, dyscyplina1, wydawnictwo_ciagle_z_autorem, rok + ) + + @pytest.mark.django_db @pytest.fixture def raport_slotow_uczelnia(db): diff --git a/src/raport_slotow/tests/test_ewaluacja.py b/src/raport_slotow/tests/test_ewaluacja.py index 1a91c3bd..7f288f4a 100644 --- a/src/raport_slotow/tests/test_ewaluacja.py +++ b/src/raport_slotow/tests/test_ewaluacja.py @@ -1,31 +1,44 @@ from django.urls import reverse +from fixtures.conftest import _wydawnictwo_ciagle_maker +from raport_slotow.tests.conftest import _rekord_slotu_maker from raport_slotow.views import ewaluacja from bpp.models import Autor_Dyscyplina def test_raport_ewaluacja_no_queries( - rekord_slotu, django_assert_max_num_queries, admin_client, rok, autor_jan_kowalski, + jednostka, dyscyplina1, ): Autor_Dyscyplina.objects.create( rok=rok, autor=autor_jan_kowalski, dyscyplina_naukowa=dyscyplina1 ) + for a in range(100): + wydawnictwo = _wydawnictwo_ciagle_maker() + wydawnictwo.dodaj_autora(autor_jan_kowalski, jednostka) + + _rekord_slotu_maker( + autor_jan_kowalski, jednostka, dyscyplina1, wydawnictwo, rok + ) + url = reverse( "raport_slotow:raport-ewaluacja", ) r = ewaluacja.RaportSlotowEwaluacja() r.data = dict(od_roku=rok, do_roku=rok, _export="html") - assert r.get_queryset().count() == 1 + assert r.get_queryset().count() == 100 - with django_assert_max_num_queries(13): + # UWAGA UWAGA UWAGA + # Jeżeli nagle z jakichś powodów ten raport zacznie generować więcej zapytań, to proszę + # się nad tym tematem POCHYLIC i nie zwiekszać tej wartosci max_num_queries... + with django_assert_max_num_queries(12): admin_client.get( url, data={ diff --git a/src/raport_slotow/views/ewaluacja.py b/src/raport_slotow/views/ewaluacja.py index 8682f639..56f5273c 100644 --- a/src/raport_slotow/views/ewaluacja.py +++ b/src/raport_slotow/views/ewaluacja.py @@ -106,6 +106,10 @@ def get_queryset(self): "autor_dyscyplina__dyscyplina_naukowa", "autor_dyscyplina__subdyscyplina_naukowa", ) + .prefetch_related( + "autorzy__autor__aktualna_jednostka", + "autorzy__jednostka", + ) .only( "autorzy_z_dyscypliny", "pkdaut", @@ -116,6 +120,7 @@ def get_queryset(self): "rekord__tytul_oryginalny", "rekord__opis_bibliograficzny_autorzy_cache", "rekord__punkty_kbn", + "rekord__impact_factor", "rekord__informacje", "rekord__opis_bibliograficzny_zapisani_autorzy_cache", "rekord__wydawnictwo_nadrzedne_id", @@ -127,6 +132,7 @@ def get_queryset(self): "autorzy__autor__nazwisko", "autorzy__autor__pseudonim", "autorzy__autor__poprzednie_nazwiska", + "autorzy__autor__pokazuj_poprzednie_nazwiska", "autorzy__autor__id", "autorzy__autor__pbn_id", "autorzy__autor__orcid", @@ -134,6 +140,10 @@ def get_queryset(self): "autorzy__autor__tytul", "autorzy__upowaznienie_pbn", "autorzy__profil_orcid", + "autorzy__jednostka_id", + "autorzy__jednostka__nazwa", + "autorzy__autor__aktualna_jednostka_id", + "autorzy__autor__aktualna_jednostka__nazwa", "autor_dyscyplina__dyscyplina_naukowa", "autor_dyscyplina__dyscyplina_naukowa__id", "autor_dyscyplina__dyscyplina_naukowa__nazwa", From 88047418e5ebab47981df6477b907e1eb40338ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 20:45:57 +0200 Subject: [PATCH 08/14] Fix tests --- src/raport_slotow/tests/test_ewaluacja.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/raport_slotow/tests/test_ewaluacja.py b/src/raport_slotow/tests/test_ewaluacja.py index 7f288f4a..11d06c1f 100644 --- a/src/raport_slotow/tests/test_ewaluacja.py +++ b/src/raport_slotow/tests/test_ewaluacja.py @@ -14,6 +14,8 @@ def test_raport_ewaluacja_no_queries( autor_jan_kowalski, jednostka, dyscyplina1, + jezyki, + typy_odpowiedzialnosci, ): Autor_Dyscyplina.objects.create( rok=rok, autor=autor_jan_kowalski, dyscyplina_naukowa=dyscyplina1 From 87bee597537432e0d61482554799e826b16c80e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 20:57:22 +0200 Subject: [PATCH 09/14] Fix 1412 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wyświetlaj ID systemu kadrowego --- src/bpp/newsfragments/1412.feature.rst | 2 ++ src/raport_slotow/tables.py | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 src/bpp/newsfragments/1412.feature.rst diff --git a/src/bpp/newsfragments/1412.feature.rst b/src/bpp/newsfragments/1412.feature.rst new file mode 100644 index 00000000..e1f13dd5 --- /dev/null +++ b/src/bpp/newsfragments/1412.feature.rst @@ -0,0 +1,2 @@ + +wyswietlaj ID systemu kadrowego w raport slotów - uczelnia diff --git a/src/raport_slotow/tables.py b/src/raport_slotow/tables.py index 34f740bb..e17b0bde 100644 --- a/src/raport_slotow/tables.py +++ b/src/raport_slotow/tables.py @@ -104,6 +104,7 @@ class Meta: "jednostka", "pbn_id", "orcid", + "system_kadrowy_id", "dyscyplina", "pkd_aut_sum", "slot", @@ -116,6 +117,7 @@ class Meta: dyscyplina = Column() pbn_id = Column("PBN ID", "autor.pbn_id") orcid = Column("ORCID", "autor.orcid") + system_kadrowy_id = Column("System kadrowy ID", "autor.system_kadrowy_id") jednostka = Column("Aktualna jednostka") def __init__(self, od_roku, do_roku, slot, *args, **kw): @@ -160,6 +162,7 @@ class Meta: "autor", "pbn_id", "orcid", + "system_kadrowy_id", "jednostka", "wydzial", "dyscyplina", From 7a6b845782c20fb160dfaa8162045c425a8fda54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 20:58:13 +0200 Subject: [PATCH 10/14] Fix 1409 Maksymalny rok dla PBN 2025 --- src/bpp/const.py | 2 +- src/bpp/newsfragments/1409.feature.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/bpp/newsfragments/1409.feature.rst diff --git a/src/bpp/const.py b/src/bpp/const.py index 8e855411..fb03d448 100644 --- a/src/bpp/const.py +++ b/src/bpp/const.py @@ -93,7 +93,7 @@ class TRYB_DOSTEPU(Enum): PBN_MIN_ROK = 2017 # Maksymalny rok dla procedur eksportujących do PBN, liczącyc punkty/sloty oraz testów -PBN_MAX_ROK = 2024 +PBN_MAX_ROK = 2025 PBN_LATA = list(range(PBN_MIN_ROK, PBN_MAX_ROK + 1)) diff --git a/src/bpp/newsfragments/1409.feature.rst b/src/bpp/newsfragments/1409.feature.rst new file mode 100644 index 00000000..a5414d3b --- /dev/null +++ b/src/bpp/newsfragments/1409.feature.rst @@ -0,0 +1,2 @@ + +maksymalny rok dla PBN ustawiony na 2025 From 437b99312fe8f7fc3e92f4de1b322ef4d158dcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 21:33:39 +0200 Subject: [PATCH 11/14] Fix 1445 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit usuń błąd który nie wyświetlał nie-obcych autorów w sytuacji gdy byli przypisani do obcej jednostki + błędnej jednostki (ale mieli dodatkowe przypisania, właściwe dla uczelni) w sytuacji wyłączonej opcji "pokazuj obcych autorów w przeglądaniu danych" --- src/bpp/newsfragments/1445.bugfix.rst | 2 ++ src/bpp/views/browse.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/bpp/newsfragments/1445.bugfix.rst diff --git a/src/bpp/newsfragments/1445.bugfix.rst b/src/bpp/newsfragments/1445.bugfix.rst new file mode 100644 index 00000000..b01f53b6 --- /dev/null +++ b/src/bpp/newsfragments/1445.bugfix.rst @@ -0,0 +1,2 @@ + +usuń błąd który nie wyświetlał nie-obcych autorów w sytuacji gdy byli przypisani do obcej jednostki + błędnej jednostki (ale mieli dodatkowe przypisania, właściwe dla uczelni) w sytuacji wyłączonej opcji "pokazuj obcych autorów w przeglądaniu danych" diff --git a/src/bpp/views/browse.py b/src/bpp/views/browse.py index 46162896..97e0d5dd 100644 --- a/src/bpp/views/browse.py +++ b/src/bpp/views/browse.py @@ -167,7 +167,8 @@ def get_queryset(self): Q( autor_jednostka__jednostka__pk=-1 ) # "BŁĄD: brak wpisanej jednostki" - & Q(autor_jednostka__jednostka__pk=uczelnia.obca_jednostka_id), + & Q(autor_jednostka__jednostka__pk=uczelnia.obca_jednostka_id) + & Q(autor_jednostka__count__lte=2) ) ret = ret.exclude(aktualna_jednostka=None, autor_jednostka__count=1) From 765a83b303d392cf2f71ff2e12f07b5b9da079f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 22:13:49 +0200 Subject: [PATCH 12/14] Update lockfile --- poetry.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0bf47148..f697d26b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4866,13 +4866,13 @@ md = ["cmarkgfm (>=0.8.0)"] [[package]] name = "redis" -version = "5.1.0" +version = "5.1.1" description = "Python client for Redis database and key-value store" optional = false python-versions = ">=3.8" files = [ - {file = "redis-5.1.0-py3-none-any.whl", hash = "sha256:fd4fccba0d7f6aa48c58a78d76ddb4afc698f5da4a2c1d03d916e4fd7ab88cdd"}, - {file = "redis-5.1.0.tar.gz", hash = "sha256:b756df1e4a3858fcc0ef861f3fc53623a96c41e2b1f5304e09e0fe758d333d40"}, + {file = "redis-5.1.1-py3-none-any.whl", hash = "sha256:f8ea06b7482a668c6475ae202ed8d9bcaa409f6e87fb77ed1043d912afd62e24"}, + {file = "redis-5.1.1.tar.gz", hash = "sha256:f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72"}, ] [package.dependencies] @@ -4951,13 +4951,13 @@ idna2008 = ["idna"] [[package]] name = "rich" -version = "13.9.1" +version = "13.9.2" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.8.0" files = [ - {file = "rich-13.9.1-py3-none-any.whl", hash = "sha256:b340e739f30aa58921dc477b8adaa9ecdb7cecc217be01d93730ee1bc8aa83be"}, - {file = "rich-13.9.1.tar.gz", hash = "sha256:097cffdf85db1babe30cc7deba5ab3a29e1b9885047dab24c57e9a7f8a9c1466"}, + {file = "rich-13.9.2-py3-none-any.whl", hash = "sha256:8c82a3d3f8dcfe9e734771313e606b39d8247bb6b826e196f4914b333b743cf1"}, + {file = "rich-13.9.2.tar.gz", hash = "sha256:51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c"}, ] [package.dependencies] @@ -5523,13 +5523,13 @@ yaml = ["pyyaml"] [[package]] name = "termcolor" -version = "2.4.0" +version = "2.5.0" description = "ANSI color formatting for output in terminal" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "termcolor-2.4.0-py3-none-any.whl", hash = "sha256:9297c0df9c99445c2412e832e882a7884038a25617c60cea2ad69488d4040d63"}, - {file = "termcolor-2.4.0.tar.gz", hash = "sha256:aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a"}, + {file = "termcolor-2.5.0-py3-none-any.whl", hash = "sha256:37b17b5fc1e604945c2642c872a3764b5d547a48009871aea3edd3afa180afb8"}, + {file = "termcolor-2.5.0.tar.gz", hash = "sha256:998d8d27da6d48442e8e1f016119076b690d962507531df4890fcd2db2ef8a6f"}, ] [package.extras] From 46749d1beb4e59321ddafbc9614908a26d03460d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 22:15:27 +0200 Subject: [PATCH 13/14] Zostaw docker-compose.yml w spokoju --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d183525b..6f0e539e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -127,9 +127,6 @@ push = false "src/django_bpp/version.py" = ['VERSION = "{pep440_version}"'] "package.json" = ['"version": "{version}",'] "Makefile" = [ 'DOCKER_VERSION="{pep440_version}"' ] -"docker-compose.yml" = [ ":{pep440_version}"] - - [tool.poetry.dependencies] From 7dea7f7670f36981a28bc2613d0a2b38a8d1743f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pasternak?= Date: Sun, 6 Oct 2024 22:15:35 +0200 Subject: [PATCH 14/14] bump version v202410.1138 -> v202410.1139 --- Makefile | 2 +- package.json | 2 +- pyproject.toml | 6 +++--- setup.py | 2 +- src/django_bpp/version.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 79e66ce2..12516e3f 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ loc: clean pygount -N ... -F "...,staticroot,migrations,fixtures" src --format=summary -DOCKER_VERSION="202410.1138" +DOCKER_VERSION="202410.1139" DOCKER_BUILD=build --platform linux/amd64,linux/arm64 --push build-dbserver: diff --git a/package.json b/package.json index bff45996..04cb6f23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bpp-iplweb", - "version": "v202410.1138", + "version": "v202410.1139", "license": "MIT", "devDependencies": { "grunt": ">=1.6.1", diff --git a/pyproject.toml b/pyproject.toml index 6f0e539e..c4079398 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "bpp_iplweb" -version = "202410.1138" +version = "202410.1139" description = "" authors = ["Michał Pasternak "] license = "MIT" @@ -113,7 +113,7 @@ pytest-rerunfailures = "^14.0" django-debug-toolbar = "^4.4.6" [tool.bumpver] -current_version = "v202410.1138" +current_version = "v202410.1139" version_pattern = "vYYYY0M.BUILD[-TAGNUM][GITHASH]" commit_message = "bump version {old_version} -> {new_version}" commit = true @@ -265,7 +265,7 @@ build-backend = "poetry.core.masonry.api" [tool.towncrier] package = "bpp" -version = "202410.1138" +version = "202410.1139" package_dir = "src" filename = "HISTORY.rst" diff --git a/setup.py b/setup.py index 9e917d88..8999c29b 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ def requirements(fn="requirements.txt"): setup( name="bpp-iplweb", - version="202410.1138", + version="202410.1139", description="System informatyczny do zarządzania bibliografią publikacji pracowników naukowych", long_description=readme, long_description_content_type="text/x-rst", diff --git a/src/django_bpp/version.py b/src/django_bpp/version.py index 5c3a327a..254bb096 100644 --- a/src/django_bpp/version.py +++ b/src/django_bpp/version.py @@ -1,4 +1,4 @@ -VERSION = "202410.1138" +VERSION = "202410.1139" if __name__ == "__main__": import sys