Merge branch 'prepare_v1-1-2' into 'master'

prepare new release

See merge request !15

.gitlab-ci.yml

@@ -9,7 +9,7 @@ default:
   # Stupid GitLab fails to load the cache for second jobs.
   cache: # Global `cache`.
     paths:
-      - ipp-env
+      - g2p-env-$CI_PIPELINE_ID
 
   artifacts:
     reports:
@@ -21,7 +21,7 @@ default:
       - dist/*
 
   after_script: # Global `after_script`.
-    - ls ipp-env
+    - ls g2p-env-$CI_PIPELINE_ID
     - echo "Bye, $GITLAB_USER_LOGIN!"
 
 variables:
@@ -29,7 +29,7 @@ variables:
 
 stages:
   - install_and_test
-#  - release 
+  - release 
 
 # Changes (e.g. apt install, pip install) do not persist across different GitLab CI jobs.
 # => Consolidate everything in GitLab CI into a single job, because the design is dumb.
@@ -46,8 +46,8 @@ install_and_test:
     - pwd
     # Install everything.
     - apt-get -qq update && apt-get -qq install -y gcc gfortran libblas-dev liblapack-dev libopenmpi-dev openmpi-bin
-    - python -m venv ipp-env
-    - source ipp-env/bin/activate
+    - python -m venv g2p-env-$CI_PIPELINE_ID
+    - source g2p-env-$CI_PIPELINE_ID/bin/activate
     - pip install -U pip build pytest pytest-cov coverage twine 
   script:
     # Build: build python package, install package.
@@ -71,53 +71,52 @@ install_and_test:
 
 
 # release
+deploy:
+  stage: release
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_REF_NAME == "master" 
+  needs: ["install_and_test"]
+  script:
+    - twine upload dist/*
 
-# deploy:
-#   stage: release
-#   rules:
-#     - if: $CI_COMMIT_TAG
-#       when: never
-#     - if: $CI_COMMIT_REF_NAME == "master" 
-#   needs: ["default_build"]
-#   script:
-#     - twine upload dist/*
-
-# vars:
-#   stage: release
-#   rules:
-#     - if: $CI_COMMIT_TAG
-#       when: never
-#     - if: $CI_COMMIT_REF_NAME == "master"
-#   before_script:
-#     - uname -s # get system info
-#   script:
-#     - echo "VERSION=$(var=$(<pyproject.toml); set -- $var; echo ${14} | sed 's/^.//' | sed 's/.$//')" >> vars.env
-#   artifacts:
-#     reports:
-#       dotenv: vars.env
+vars:
+  stage: release
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_REF_NAME == "master"
+  before_script:
+    - uname -s # get system info
+  script:
+    - echo "VERSION=$(var=$(<pyproject.toml); set -- $var; echo ${14} | sed 's/^.//' | sed 's/.$//')" >> vars.env
+  artifacts:
+    reports:
+      dotenv: vars.env
 
-# release_job:
-#   stage: release
-#   image: registry.gitlab.com/gitlab-org/release-cli:latest
-#   rules:
-#     - if: $CI_COMMIT_TAG
-#       when: never
-#     - if: $CI_COMMIT_REF_NAME == "master"
-#   needs: ['vars']
-#   before_script:
-#     - uname -s # get system info
-#   script:
-#     - cat /etc/*-release
-#     - echo $VERSION
-#   release:                                         # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
-#     tag_name: 'v$VERSION'                          # The version is incremented per pipeline.
-#     name: 'v$VERSION'
-#     ref: '$CI_COMMIT_SHA'                          # The tag is created from the pipeline SHA.
-#     description: 'CHANGELOG.md'
-#     assets:
-#       links:
-#         - name: 'PyPI'
-#           url: 'https://pypi.org/project/gvec_to_python/'
+release_job:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_REF_NAME == "master"
+  needs: ['vars']
+  before_script:
+    - uname -s # get system info
+  script:
+    - cat /etc/*-release
+    - echo $VERSION
+  release:                                         # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
+    tag_name: 'v$VERSION'                          # The version is incremented per pipeline.
+    name: 'v$VERSION'
+    ref: '$CI_COMMIT_SHA'                          # The tag is created from the pipeline SHA.
+    description: 'CHANGELOG.md'
+    assets:
+      links:
+        - name: 'PyPI'
+          url: 'https://pypi.org/project/gvec_to_python/'
 
 
 # OLD, TO BE DELETED

README.md

@@ -7,7 +7,7 @@ pip install gvec_to_python
 ```
 Or from source:
 ```
-git clone git@gitlab.mpcdf.mpg.de:spossann/gvec_to_python.git
+git clone git@gitlab.mpcdf.mpg.de:gvec-group/gvec_to_python.git
 cd gvec_to_python
 pip install -e .
 ```

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gvec-to-python"
-version = "1.1.1"
+version = "1.1.2"
 readme = "README.md"
 requires-python = ">=3.7"
 license = {file = "LICENSE"}
@@ -31,8 +31,8 @@ dependencies = [
 ]
 
 [project.urls]
-repository = "https://gitlab.mpcdf.mpg.de/spossann/gvec_to_python"
-"Bug Tracker" = "https://gitlab.mpcdf.mpg.de/spossann/gvec_to_python/-/issues"
+repository = "https://gitlab.mpcdf.mpg.de/gvec-group/gvec_to_python"
+"Bug Tracker" = "https://gitlab.mpcdf.mpg.de/gvec-group/gvec_to_python/-/issues"
 
 [project.scripts]
 compile-gvec-tp = "gvec_to_python.console.compile:compile_gvec_to_python"