Skip to content

Commit

Permalink
Merge pull request #709 from ScilifelabDataCentre/DDS-2073-Bump-Pytho…
Browse files Browse the repository at this point in the history
…n-version-in-dds_cli-to-same-as-dds_web

Bump python version in client
  • Loading branch information
rv0lt authored Sep 12, 2024
2 parents 1d03602 + f0edf9d commit 247a5fd
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytest-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.10.4
- name: Set up Python 3.12
uses: actions/setup-python@v2
with:
python-version: 3.10.4
python-version: 3.12

- name: Install dds_cli
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- uses: actions/checkout@v3
name: Check out source-code repository

- name: Set up Python 3.9
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12

- name: Install python dependencies
run: |
Expand Down
1 change: 1 addition & 0 deletions SPRINTLOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,4 @@ _Empty sprint_

- Remove pinned version in requirements-dev.txt to resolve CVE ([#706](https://github.com/ScilifelabDataCentre/dds_cli/pull/706))
- Add CODEOWNERS file in order to define Team Hermes as owners of all files in repository ([#707](https://github.com/ScilifelabDataCentre/dds_cli/pull/707))
- Update documentation and related libraries for pyton 3.12, dropped support for python 3.7 ([#709](https://github.com/ScilifelabDataCentre/dds_cli/pull/709))
4 changes: 2 additions & 2 deletions WINDOWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# How to install the DDS CLI on Windows

## 1. Download and install Python > 3.7
## 1. Download and install Python > 3.8

### 1.1. Go to https://www.python.org/downloads/windows/

Expand Down Expand Up @@ -42,7 +42,7 @@

![Powershell 1](docs/_static/windows/powershell_top-1.png)

> **Note:** Upon entering `python --version` the version of the previously installed Python distribution should be shown. If a version number < 3.7 is shown or Python is not found, please consult the :ref:`Troubleshooting<troubleshooting>` section below.
> **Note:** Upon entering `python --version` the version of the previously installed Python distribution should be shown. If a version number < 3.8 is shown or Python is not found, please consult the :ref:`Troubleshooting<troubleshooting>` section below.
### 2.3. Python ships with a helper program called **pip** to install additional packages. In the next step, this software should be upgraded to its current version.

Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ As mentioned above, you can install ``dds-cli`` from PyPI or via an executable.
Install from **PyPI**
-----------------------

1. To perform these steps you need to have Python version 3.7 or higher installed.
1. To perform these steps you need to have Python version 3.8 or higher installed.

* First check which Python version you have

Expand All @@ -39,7 +39,7 @@ Install from **PyPI**

.. image:: ../img/python3-version.svg

If this does not return ``Python 3.7.x`` or higher, you will need to `install Python <https://www.python.org/downloads/>`_.
If this does not return ``Python 3.8.x`` or higher, you will need to `install Python <https://www.python.org/downloads/>`_.

.. warning::

Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ click-pathlib==2020.3.13.0
cryptography==42.0.4
immutabledict==2.2.1
jwcrypto==1.5.6
prettytable==3.4.1
prompt-toolkit==3.0.31
prettytable==3.7.0
prompt-toolkit==3.0.40
PyNaCl==1.5.0
pytz==2022.2.1
PyYAML==6.0.1
questionary==1.10.0
requests==2.32.0
rich==12.5.1
PyYAML==6.0.2
questionary==1.10.0 # not mantained since 2018, can break anytime
requests==2.32.2
rich==13.6.0
rich-click==1.5.2
simplejson==3.17.6
tzlocal==4.2
zstandard==0.19.0
zstandard==0.22.0
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
classifiers=[
"Development Status :: 4 - Beta",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
url="https://github.com/ScilifelabDataCentre/dds_cli",
author="SciLifeLab Data Centre",
Expand Down
4 changes: 2 additions & 2 deletions tests/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Flask==2.0.2
Flask==2.2.5
requests-mock==1.9.3
pytest==7.1.2
pytest-cov==3.0.0
pyfakefs==4.5.5
pyfakefs==5.3.0
Werkzeug==2.2.3

0 comments on commit 247a5fd

Please sign in to comment.