Skip to content

Commit 97b6850

Browse files
committed
Change all versions. Re-lock
1 parent df556c5 commit 97b6850

31 files changed

Lines changed: 4677 additions & 8819 deletions

.github/workflows/python_analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
with:
2929
package-manager: 'conda'
3030
app-name: 'surface_apps'
31-
python-version: '3.10'
31+
python-version: '3.12'
3232
call-workflow-pytest:
3333
name: Pytest
3434
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
3535
with:
3636
package-manager: 'conda'
37-
python-versions: '["3.10", "3.11", "3.12"]'
37+
python-versions: '["3.12", "3.13"]'
3838
os: '["ubuntu-latest", "windows-latest"]'
3939
cache-number: 1
40-
codecov-reference-python-version: '3.10'
40+
codecov-reference-python-version: '3.12'
4141
codecov-reference-os: '["windows-latest"]'
4242
secrets:
4343
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/python_deploy_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@main
1616
with:
1717
package-name: 'surface-apps'
18-
python-version: '3.10'
18+
python-version: '3.12'
1919
source-repo-names: '["public-noremote-conda-dev"]'
2020
conda-channels: '["conda-forge"]'
2121
publish-repo-names: '["public-noremote-conda-dev"]'
@@ -30,7 +30,7 @@ jobs:
3030
package-manager: 'poetry'
3131
package-name: 'surface-apps'
3232
version-tag: ${{ github.ref_name }}
33-
python-version: '3.10'
33+
python-version: '3.12'
3434
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
3535
secrets:
3636
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-22.04
1111
tools:
12-
python: "3.10"
12+
python: "3.12"
1313
# You can also specify other tool versions:
1414
# nodejs: "19"
1515
# rust: "1.64"

README-dev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The python versions are specified at the beginning of the ``devtools/run_conda_l
4646

4747
.. code-block:: python
4848
49-
_python_versions = ["3.10", "3.11"]
49+
_python_versions = ["3.12", "3.13"]
5050
5151
The ``Install_or_Update.bat`` and the ``setup-dev.bat`` will use them to install the environment.
5252

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Documentation
5050

5151
Installation
5252
^^^^^^^^^^^^
53-
**surface-apps** is currently written for Python 3.10 or higher.
53+
**surface-apps** is currently written for Python 3.12 or higher.
5454

5555
Install Conda
5656
-------------

deps-lock-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include_dev: True
22
py_versions:
3-
- "3.10"
4-
- "3.11"
53
- "3.12"
4+
- "3.13"

docs/source/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@
2525
# The full version, including alpha/beta/rc tags.
2626
release = version("surface-apps")
2727
# The shorter X.Y.Z version.
28-
version = Version(release).base_version
28+
pep_version = Version(release)
29+
if pep_version.is_postrelease:
30+
release = pep_version.base_version
2931

32+
# The short X.Y.Z version.
33+
version = Version(release).base_version
3034

3135
# -- General configuration ---------------------------------------------------
3236
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

environments/env-python-3.13.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies:
2+
- python=3.13.*
3+
- pip

environments/py-3.10-linux-64-dev.conda.lock.yml

Lines changed: 0 additions & 169 deletions
This file was deleted.

environments/py-3.10-linux-64.conda.lock.yml

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)