diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5871b91ad483a25ace1ebf02c79a7805b7d099af..cec5c0e92de7ca7af945c3112ccf679c81e01e1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,17 +152,12 @@ deploy-pypi: only: - tags - variables: - TWINE_USERNAME: gitlab-ci-token - TWINE_PASSWORD: ${CI_JOB_TOKEN} - TWINE_REPOSITORY_URL: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi - before_script: - pip install twine script: - python setup.py sdist bdist_wheel - - twine upload --repository-url ${TWINE_REPOSITORY_URL} dist/* + - twine upload -r pypi dist/* bump-python-deps: stage: deploy diff --git a/docs/get_started/index.md b/docs/get_started/index.md index c46de2dbd074f4774dac8924e2979495f9757f5e..fb393e196c56f605aa6502eb19c72d2188341088 100644 --- a/docs/get_started/index.md +++ b/docs/get_started/index.md @@ -2,26 +2,14 @@ ## Installation -DAN is published on a GitLab package registry. -You need [a personal access token](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html) with [scope](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#personal-access-token-scopes) `read_api` in order to install this module. You will need to add the below to your `~/.netrc` file: - -```shell -machine gitlab.teklia.com -login __token__ -password <YOUR_PERSONAL_TOKEN> -``` - ### As a dependency To install DAN as a dependency, you need to first add the following line to your `requirements.txt` file: ```shell ---index-url https://gitlab.teklia.com/api/v4/projects/98/packages/pypi/simple -teklia-dan +atr-dan ``` -The `--index-url` argument is required to find the `DAN` package. - Then you can install it via pip: ```shell @@ -33,11 +21,9 @@ pip install -r requirements.txt To install DAN directly, you can install it via pip: ```shell -pip install --index-url https://gitlab.teklia.com/api/v4/projects/98/packages/pypi/simple teklia-dan +pip install atr-dan ``` -The `--index-url` argument is required to find the `DAN` package. - --- To learn more about the newly installed `teklia-dan` command, make sure to run: diff --git a/setup.py b/setup.py index 7ff5de4fef696fd93d9a546674cda6a197879be3..97763adb6a3f26a794517d711ee5d05bf494e9be 100755 --- a/setup.py +++ b/setup.py @@ -34,14 +34,14 @@ def parse_requirements(filename: str) -> List[str]: setup( - name="teklia-dan", + name="atr-dan", version=Path("VERSION").read_text(), description="Teklia DAN", long_description=Path("README.md").read_text(), long_description_content_type="text/markdown", author="Teklia", author_email="contact@teklia.com", - url="https://gitlab.com/teklia/atr/dan", + url="https://gitlab.teklia.com/atr/dan", python_requires=">=3.10", install_requires=parse_requirements("requirements.txt"), packages=find_packages(),