Skip to content
GitLab
Commit 40750649 authored by Maximilian Schanner's avatar Maximilian Schanner
Browse files

URL change to new git instance.

parent 51711771
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 40750649
......@@ -19,12 +19,12 @@ build-job:
- python3 setup.py sdist bdist_wheel
- apt-get install -y -qq curl
# get the current package id
- 'export ID=$(curl --request GET --header "PRIVATE-TOKEN: ${API_ACCES_TOKEN}" "https://gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages" | grep -P "(?<=.id.:)(\\d+)" -o )'
- 'export ID=$(curl --request GET --header "PRIVATE-TOKEN: ${API_ACCES_TOKEN}" "https://git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages" | grep -P "(?<=.id.:)(\\d+)" -o )'
# remove the package, as we want a new build even if the version number did not change
- 'echo $ID'
- 'curl --request DELETE --header "PRIVATE-TOKEN: ${API_ACCES_TOKEN}" "https://gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/$ID"'
- 'curl --request DELETE --header "PRIVATE-TOKEN: ${API_ACCES_TOKEN}" "https://git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/$ID"'
# upload
- TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --repository-url https://gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi dist/* --verbose
- TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --repository-url https://git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi dist/* --verbose
only:
changes:
- pymagglobal/*.py
......@@ -37,10 +37,10 @@ test-conda:
image: continuumio/miniconda3
script:
- conda install cartopy
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- python3 tests/run_tests.py
- pip uninstall -y pymagglobal
- pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- python3 tests/run_tests.py
only:
changes:
......@@ -55,10 +55,10 @@ test-job:
script:
- apt-get update -y -qq
- apt-get install -y -qq python3-dev python3-pip python3-cartopy
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- python3 tests/run_tests.py
- pip uninstall -y pymagglobal
- pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- python3 tests/run_tests.py
artifacts:
paths:
......@@ -74,7 +74,7 @@ pages:
script:
- apt-get update -y -qq
- apt-get install -y -qq python3-dev python3-pip python3-cartopy
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple
- pip install sphinx sphinx-argparse
- sphinx-build -b html docs public
artifacts:
......
README.md
View file @ 40750649
......@@ -9,7 +9,7 @@ By default, `pymagglobal` includes several models. Use
```console
$ pymagglobal --list-models
```
to get a list of these default models or go to [pymagglobal/dat](https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal/-/tree/master/pymagglobal/dat) for further information. Using
to get a list of these default models or go to [pymagglobal/dat](https://git.gfz-potsdam.de/sec23/korte/pymagglobal/-/tree/master/pymagglobal/dat) for further information. Using
```console
$ pymagglobal ... <path/to/your_model>
```
......@@ -49,7 +49,7 @@ Data files are licensed under [CC-BY 4.0](https://creativecommons.org/licenses/b
`pymagglobal` is distributed via the PyPI registry of this repository. It can be installed using
```console
$ pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
$ pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
```
Since [conda](https://docs.conda.io/) version 4.6, conda and pip get along well. So you can also run `pip install ...` from inside your conda environment.
......@@ -61,7 +61,7 @@ $ nix-shell
from within the `pymagglobal` root directory. You may also use the nix-expression [pymagglobal.nix] to include `pymagglobal` in your own environments.
## Documentation
Check out the extended documention [here](https://sec23.gitext-pages.gfz-potsdam.de/korte/pymagglobal). From the command line, you can use `pymagglobal` to get various results from the models. For example,
Check out the extended documention [here](https://sec23.git-pages.gfz-potsdam.de/korte/pymagglobal). From the command line, you can use `pymagglobal` to get various results from the models. For example,
```console
$ pymagglobal dipole gufm1
```
......@@ -126,7 +126,7 @@ $ python tests/run_tests.py
```
from `<pymagglobal>`. Some tests require `FieldTools`, `packaging` and `orthopoly` and will be skipped, if the respective pacakges are not available. You can install `orthopoly` and `packaging` together with `pymagglobal`, by running
```console
$ pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
$ pip install pymagglobal[tests] --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
```
We also provide the expression for a nix-shell with all dependencies installed. This will however not test your local installation, but your local repository. To perform the tests, run
......
docs/conf.py
View file @ 40750649
......@@ -64,7 +64,7 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
# Add external links to source code
def linkcode_resolve(domain, info):
'''Returns external links to the source of objects'''
url = 'https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal'
url = 'https://git.gfz-potsdam.de/sec23/korte/pymagglobal'
filename = info['module'].replace('.', '/') + '.py'
if info['fullname'] in core_members:
return url + '/-/tree/master/' + info['module'] + '/core.py'
......
docs/index.rst
View file @ 40750649
......@@ -22,9 +22,9 @@ Installation
.. code-block:: bash
$ pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@gitext.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
$ pip install pymagglobal --extra-index-url https://public:5mz_iyigu-WE3HySBH1J@git.gfz-potsdam.de/api/v4/projects/1055/packages/pypi/simple
See also `here <https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal#installation>`_ and `here <https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal#testing>`_.
See also `here <https://git.gfz-potsdam.de/sec23/korte/pymagglobal#installation>`_ and `here <https://git.gfz-potsdam.de/sec23/korte/pymagglobal#testing>`_.
.. include:: ../pymagglobal/dat/README.rst
......@@ -54,4 +54,4 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
* `Repository <https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal/>`_
* `Repository <https://git.gfz-potsdam.de/sec23/korte/pymagglobal/>`_
pymagglobal/__main__.py
View file @ 40750649
......@@ -80,7 +80,7 @@ class ListModelsAction(argparse.Action):
print(f'Currently available models are:')
for it in models_list:
print(it)
print(f'Visit https://gitext.gfz-potsdam.de/sec23/korte/pymagglobal/'
print(f'Visit https://git.gfz-potsdam.de/sec23/korte/pymagglobal/'
f'-/tree/master/pymagglobal/dat for detailed information.')
parser.exit()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment