Adapt to renaming of python-style to RecordFlux-devutils

AdaCore · Jan 6, 2023 · 29f1e96 · 29f1e96
1 parent 6b5b31d
commit 29f1e96
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 33 deletions.
diff --git a/.config/pyproject.toml b/.config/pyproject.toml
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -40,7 +40,7 @@ jobs:
             ~/.cache/pip
             ~/.local/lib/python${{ env.python-version }}/site-packages
             ~/.local/bin
-          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
       - name: Cache GNAT Community
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -52,7 +52,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ env.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -146,7 +146,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ matrix.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ env.GNAT }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg', 'Makefile') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ env.GNAT }}-${{ hashFiles('setup.py', 'devutils/setup.cfg', 'Makefile') }}
     - name: Install GNAT Pro
       uses: ./.github/actions/install_gnat_pro
       with:
@@ -212,7 +212,7 @@ jobs:
             ~/.cache/pip
             ~/.local/lib/python${{ env.python-version }}/site-packages
             ~/.local/bin
-          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ matrix.gnat-distrib }}${{ matrix.gnat-version }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg', 'Makefile') }}
+          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ matrix.gnat-distrib }}${{ matrix.gnat-version }}-${{ hashFiles('setup.py', 'devutils/setup.cfg', 'Makefile') }}
       - name: Cache GNAT Community
         if: ${{ matrix.gnat-distrib == 'community' }}
         uses: actions/cache@v2
@@ -240,7 +240,7 @@ jobs:
           path: |
             ~/.config/alire
             build/alire
-          key: ${{ runner.os }}-alire${{ env.ALIRE_VERSION }}-python${{ env.PYTHON_VERSION }}-${{ matrix.gnat-distrib }}${{ matrix.gnat-version }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg', 'Makefile') }}
+          key: ${{ runner.os }}-alire${{ env.ALIRE_VERSION }}-python${{ env.PYTHON_VERSION }}-${{ matrix.gnat-distrib }}${{ matrix.gnat-version }}-${{ hashFiles('setup.py', 'devutils/setup.cfg', 'Makefile') }}
       - name: Install Alire
         if: ${{ matrix.gnat-distrib == 'fsf' }}
         uses: alire-project/setup-alire@v1
@@ -299,7 +299,7 @@ jobs:
             ~/.cache/pip
             ~/.local/lib/python${{ env.python-version }}/site-packages
             ~/.local/bin
-          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-gnat${{ env.GNAT }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+          key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-gnat${{ env.GNAT }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
       - name: Install GNAT Pro
         uses: ./.github/actions/install_gnat_pro
         with:
@@ -345,7 +345,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ matrix.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -434,7 +434,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ env.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -524,7 +524,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ matrix.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -596,7 +596,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ env.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -670,7 +670,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ env.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:
@@ -728,7 +728,7 @@ jobs:
           ~/.cache/pip
           ~/.local/lib/python${{ env.python-version }}/site-packages
           ~/.local/bin
-        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', '.config/python-style/setup.cfg') }}
+        key: ${{ runner.os }}-python${{ env.PYTHON_VERSION }}-${{ hashFiles('setup.py', 'devutils/setup.cfg') }}
     - name: Cache GNAT Community
       uses: actions/cache@v2
       with:

diff --git a/.gitignore b/.gitignore
@@ -3,19 +3,20 @@
 *.egg-info
 *.o
 *.pyc
-.config/python-style
 .coverage
 .coverage.*
 .env
 .hypothesis
 .mypy_cache
-.venv
+.venv*
 .vscode/configurationCache.log
 \.*.swp
 __pycache__
 build
+devutils
 dist
 gnatinspect.db
 htmlcov
+pyproject.toml
 why3session.xml.bak
 why3shapes.gz.bak
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ RECORDFLUX_ORIGIN ?= https://github.com/Componolit
 
 BUILD_DIR = build
 PYTHON_PACKAGES = bin doc/conf.py examples/apps rflx tests tools stubs setup.py
-PYTHON_STYLE_HEAD = 7f2584cd5e72fb6e7a80dcc8cce296f5821dcf8e
+DEVUTILS_HEAD = 7f2584cd5e72fb6e7a80dcc8cce296f5821dcf8e
 
 SHELL = /bin/bash
 PYTEST = python3 -m pytest -n$(TEST_PROCS) -vv --timeout=7200
@@ -55,26 +55,24 @@ $(if
 )
 endef
 
-$(shell $(call reinit_repo,.config/python-style,$(PYTHON_STYLE_HEAD)))
+$(shell $(call reinit_repo,devutils,$(DEVUTILS_HEAD)))
 
 .PHONY: all
 
 all: check test prove
 
 .PHONY: init deinit
 
-init: .config/python-style
-	$(VERBOSE)$(call checkout_repo,.config/python-style,$(PYTHON_STYLE_HEAD))
-	$(VERBOSE)ln -sf .config/python-style/pyproject.toml
-	$(VERBOSE)git update-index --skip-worktree pyproject.toml
+init: devutils
+	$(VERBOSE)$(call checkout_repo,devutils,$(DEVUTILS_HEAD))
+	$(VERBOSE)ln -sf devutils/pyproject.toml
 
 deinit:
-	$(VERBOSE)$(call remove_repo,.config/python-style)
-	$(VERBOSE)ln -sf .config/pyproject.toml
-	$(VERBOSE)git update-index --no-skip-worktree pyproject.toml
+	$(VERBOSE)$(call remove_repo,devutils)
+	$(VERBOSE)rm pyproject.toml
 
-.config/python-style:
-	$(VERBOSE)git clone $(RECORDFLUX_ORIGIN)/python-style.git .config/python-style
+devutils:
+	$(VERBOSE)git clone $(RECORDFLUX_ORIGIN)/RecordFlux-devutils.git devutils
 
 .PHONY: check check_packages check_dependencies check_black check_isort check_flake8 check_pylint check_mypy check_contracts check_pydocstyle check_doc
 
@@ -195,14 +193,14 @@ $(GNATPROVE_CACHE_DIR):
 
 install_devel:
 	tools/check_pip_version.py
-	$(MAKE) -C .config/python-style install_devel
+	$(MAKE) -C devutils install_devel
 	pip3 install -e ".[devel]"
 
 upgrade_devel:
 	tools/upgrade_dependencies.py
 
 install_devel_edge: install_devel
-	$(MAKE) -C .config/python-style install_devel_edge
+	$(MAKE) -C devutils install_devel_edge
 
 install_git_hooks:
 	install -m 755 tools/pre-{commit,push} .git/hooks/

diff --git a/pyproject.toml b/pyproject.toml