From 28b622900b1f454cc2ea44dd73faec20484a2f42 Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Tue, 6 Aug 2024 15:07:30 +0200 Subject: [PATCH 1/3] Remove dev dependencies, add compat entries for QED deps --- Project.toml | 2 ++ add_QEDcore_dev.jl | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 add_QEDcore_dev.jl diff --git a/Project.toml b/Project.toml index 6242fbd..487468c 100644 --- a/Project.toml +++ b/Project.toml @@ -16,6 +16,8 @@ QEDcore = "35dc0263-cb5f-4c33-a114-1d7f54ab753e" QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" [compat] +QEDbase = "0.2.2" +QEDcore = "0.1" IntervalSets = "0.7" QuadGK = "2" julia = "1.6" diff --git a/add_QEDcore_dev.jl b/add_QEDcore_dev.jl deleted file mode 100644 index b0b3443..0000000 --- a/add_QEDcore_dev.jl +++ /dev/null @@ -1,6 +0,0 @@ - -@warn "This repository depends on the dev branch of QEDcore.jl\n It is NOT ready for release!" - -using Pkg: Pkg -Pkg.add(; url="https://github.com/QEDjl-project/QEDcore.jl", rev="dev") -#Pkg.add(; url="https://github.com/QEDjl-project/QEDbase.jl.git", rev="process_interfaces") From a0b5e13334a369fc60a4bcee7c63182f2c5288ea Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Tue, 6 Aug 2024 15:57:16 +0200 Subject: [PATCH 2/3] Update used julia versions, update README, fix .gitignore, fix filename typo --- .JuliaFormatter.toml | 1 - .../{BuildDelopyDoc.yml => BuildDeployDoc.yml} | 2 +- .github/workflows/formatter.yaml | 2 +- .gitignore | 2 +- .gitlab-ci.yml | 8 ++++---- README.md | 17 ++--------------- 6 files changed, 9 insertions(+), 23 deletions(-) rename .github/workflows/{BuildDelopyDoc.yml => BuildDeployDoc.yml} (97%) diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml index 15971c1..323237b 100644 --- a/.JuliaFormatter.toml +++ b/.JuliaFormatter.toml @@ -1,2 +1 @@ style = "blue" - diff --git a/.github/workflows/BuildDelopyDoc.yml b/.github/workflows/BuildDeployDoc.yml similarity index 97% rename from .github/workflows/BuildDelopyDoc.yml rename to .github/workflows/BuildDeployDoc.yml index 580b922..dd93194 100644 --- a/.github/workflows/BuildDelopyDoc.yml +++ b/.github/workflows/BuildDeployDoc.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: - version: "1.9" + version: "1.10" - name: Add custom registry run: | julia --project=docs/ -e 'import Pkg; Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry.git"));' diff --git a/.github/workflows/formatter.yaml b/.github/workflows/formatter.yaml index 3a98451..5cbe730 100644 --- a/.github/workflows/formatter.yaml +++ b/.github/workflows/formatter.yaml @@ -9,7 +9,7 @@ jobs: - name: install Julia uses: julia-actions/setup-julia@v1 with: - version: 1.9 + version: 1.10 - name: Install Julia requirements run: julia --project=${GITHUB_WORKSPACE}/.formatting -e 'import Pkg; Pkg.instantiate()' - name: Check code style diff --git a/.gitignore b/.gitignore index 9bb7482..c71df05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/docs/build/ +docs/build/ # File generated by Pkg, the package manager, based on a corresponding Project.toml # It records a fixed state of all packages used by the project. As such, it should not be diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a267314..15680d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ unit_tests_releases: extends: .untit_test_template parallel: matrix: - - JULIA_VERSION: ["1.6", "1.7", "1.8", "1.9"] + - JULIA_VERSION: ["1.6", "1.7", "1.8", "1.9", "1.10", "rc"] image: julia:$JULIA_VERSION unit_tests_nightly: @@ -63,7 +63,7 @@ unit_tests_nightly: allow_failure: true generate_integration_tests: - image: julia:1.9 + image: julia:1.10 stage: generate_integration_test script: # extract package name @@ -102,8 +102,8 @@ run_integration_tests: job: generate_integration_tests strategy: depend -verify-unit-test-deps_julia1.9: - image: julia:1.9 +verify-unit-test-deps_julia1.10: + image: julia:1.10 stage: verify-unit-test-deps script: - apt update && apt install -y git diff --git a/README.md b/README.md index dabb903..c23e85c 100644 --- a/README.md +++ b/README.md @@ -6,38 +6,25 @@ :warning: This package is under construction and only contains dummy functionality for testing. -:warning: currently this is based on a dev-version of QEDcore. Please make sure that you use the QEDjl registry below. - ## Installation To install the current stable version of `QEDfields.jl` you may use the standard julia package manager within the julia REPL ```julia julia> using Pkg - -# add local registry, where QEDfields is registered -julia> Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/QEDjl-project/registry")) -# add general registry again to have it join the local registry -julia> Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/JuliaRegistries/General")) - julia> Pkg.add("QEDfields") ``` or you use the Pkg prompt by hitting `]` within the Julia REPL and then type ```julia -# add local registry, where QEDfields is registered -(@v1.9) pkg> registry add https://github.com/QEDjl-project/registry -# add general registry again to have it join the local registry -(@v1.9) pkg> registry add https://github.com/JuliaRegistries/General - -(@v1.9) pkg> add QEDfields +(@v1.10) pkg> add QEDfields ``` To install the locally downloaded package on Windows, change to the parent directory and type within the Pkg prompt ```julia -(@v1.9) pkg> add ./QEDfields.jl +(@v1.10) pkg> add ./QEDfields.jl ``` # Development From 45b1a06c403c2acbe276291646b4f7153dda61aa Mon Sep 17 00:00:00 2001 From: AntonReinhard Date: Tue, 6 Aug 2024 19:03:34 +0200 Subject: [PATCH 3/3] Remove dummy warning from README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index c23e85c..44239df 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ [![Doc Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://qedjl-project.github.io/QEDfields.jl/dev) [![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle) -:warning: This package is under construction and only contains dummy functionality for testing. - ## Installation To install the current stable version of `QEDfields.jl` you may use the standard julia package manager within the julia REPL