Skip to content

Commit

Permalink
Merge branch '24.1.x' into dist-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez authored Jan 26, 2024
2 parents 6a5359a + 0fd0f0b commit 57c5b8e
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 108 deletions.
21 changes: 12 additions & 9 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
alternate_emails:
- [email protected]
- [email protected]
- [email protected]
aliases:
- Mike Sarahan
- Michael Sarahan
num_commits: 2000
num_commits: 2001
first_commit: 2015-09-04 21:31:08
- name: Jonathan J. Helmus
email: [email protected]
Expand Down Expand Up @@ -1201,7 +1202,7 @@
alternate_emails:
- [email protected]
- name: Ken Odegard
num_commits: 159
num_commits: 164
email: [email protected]
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1224,7 +1225,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: [email protected]
num_commits: 30
num_commits: 33
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -1239,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 56
num_commits: 61
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: [email protected]
Expand All @@ -1261,7 +1262,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 42
num_commits: 44
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand All @@ -1270,7 +1271,7 @@
- name: Daniel Holth
email: [email protected]
github: dholth
num_commits: 13
num_commits: 14
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: [email protected]
Expand All @@ -1280,7 +1281,7 @@
- name: Travis Hathaway
email: [email protected]
github: travishathaway
num_commits: 5
num_commits: 6
first_commit: 2022-05-12 05:53:02
- name: Kyle Leaders
email: [email protected]
Expand Down Expand Up @@ -1326,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 8
num_commits: 10
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand Down Expand Up @@ -1365,7 +1366,9 @@
github: peetw
- name: Johnny
email: [email protected]
num_commits: 1
alternate_emails:
- [email protected]
num_commits: 2
first_commit: 2023-03-22 00:34:22
github: johnnynunez
- name: Ryan Keith
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- main
- feature/**
- '[0-9].*.x' # e.g., 3.24.x
- '[0-9][0-9].*.x' # e.g., 23.3.x

# https://docs.github.com/en/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request
pull_request:
Expand Down
4 changes: 3 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ John Kirkham <[email protected]> jakirkham <[email protected]>
John Kirkham <[email protected]> John Kirkham <[email protected]>
John Kirkham <[email protected]> John Kirkham <[email protected]>
John Omotani <[email protected]>
Johnny <[email protected]>
Johnny <[email protected]> Johnny <[email protected]>
Jonathan J. Helmus <[email protected]> Jonathan Helmus <[email protected]>
Jose Diaz-Gonzalez <[email protected]>
Joseph Crail <[email protected]>
Expand Down Expand Up @@ -183,8 +183,10 @@ Michael Cormier <[email protected]>
Michael Maltese <[email protected]>
Michael Sarahan <[email protected]> Mike Sarahan <[email protected]>
Michael Sarahan <[email protected]> Mike Sarahan <[email protected]>
Michael Sarahan <[email protected]> Mike Sarahan <[email protected]>
Michael Sarahan <[email protected]> Michael Sarahan <[email protected]>
Michael Sarahan <[email protected]> Michael Sarahan <[email protected]>
Michael Sarahan <[email protected]> Michael Sarahan <[email protected]>
Min RK <[email protected]> MinRK <[email protected]>
Morten Enemark Lund <[email protected]> mel <[email protected]>
Morten Lund <[email protected]>
Expand Down
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
[//]: # (current developments)

## 24.1.0 (2024-01-25)

### Enhancements

* Update `conda inspect channels` to use updated solver/transaction logic. (#5033)
* Relax `script_env` error in outputs when variable referenced in `script_env` is not defined.
This unifies current behavior with the top-level build. (#5105)
* Add support for Python 3.12. (#4997 via #4998)
* Adopt calender versioning (CalVer) per CEP-8 for consistency with conda. (#4975)
* Adopt expedited CEP-9 deprecation policy. (#5064)

### Deprecations

* Mark `conda inspect channels --test-installable` as pending deprecation. (#5033)
* Mark `conda_build.inspect_pkg.check_install(package)` as pending deprecation in favor of `conda_build.inspect_pkg.check_install(subdir)`. (#5033)
* Mark `conda_build.inspect_pkg.check_install(prepend)` as pending deprecation. (#5033)
* Mark `conda_build.inspect_pkg.check_install(minimal_hint)` as pending deprecation. (#5033)

### Docs

* Add GoatCounter (https://www.goatcounter.com/) as an analytics tool. (#5093)

### Other

* Remove unused Allure test report collection. (#5113)

### Contributors

* @conda-bot
* @dholth
* @jaimergp
* @jezdez
* @johnnynunez
* @kenodegard
* @msarahan
* @travishathaway
* @pre-commit-ci[bot]



## 3.28.4 (2024-01-17)

### Bug fixes
Expand Down
22 changes: 0 additions & 22 deletions news/5033-update-conda-inspect-channels

This file was deleted.

19 changes: 0 additions & 19 deletions news/5093-add-goat-counter

This file was deleted.

20 changes: 0 additions & 20 deletions news/5105-script-env-warn

This file was deleted.

19 changes: 0 additions & 19 deletions news/allure-removal

This file was deleted.

53 changes: 35 additions & 18 deletions tests/test_api_skeleton.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@
"#sha256=6cf85a5cfe8fff69553e745b05128de6fc8de8f291965c63871c79701dc6efc9"
)

PYLINT_VERSION = "2.3.1"
PYLINT_VERSION = "2.7.4" # last version to use setup.py without setup.cfg
PYLINT_HASH_TYPE = "sha256"
PYLINT_HASH_VALUE = "723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1"
PYLINT_HASH_VALUE_BLAKE2 = (
"018b538911c0ebc2529f15004f4cb07e3ca562bb9aacea5df89cc25b62e01891"
)
PYLINT_SHA256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"
PYLINT_BLAKE2 = "2d5b491cf9e85288c29759a6535e6009938c2141b137b27a0653e435dcbad6a2"
PYLINT_FILENAME = f"pylint-{PYLINT_VERSION}.tar.gz"
PYLINT_URL = f"https://files.pythonhosted.org/packages/{PYLINT_HASH_VALUE_BLAKE2[:2]}/{PYLINT_HASH_VALUE_BLAKE2[2:4]}/{PYLINT_HASH_VALUE_BLAKE2[4:]}/{PYLINT_FILENAME}"
PYLINT_URL = f"https://files.pythonhosted.org/packages/{PYLINT_BLAKE2[:2]}/{PYLINT_BLAKE2[2:4]}/{PYLINT_BLAKE2[4:]}/{PYLINT_FILENAME}"


@pytest.fixture
Expand All @@ -54,7 +52,7 @@ def mock_metadata():
"version": "UNKNOWN",
"pypiurl": PYLINT_URL,
"filename": PYLINT_FILENAME,
"digest": [PYLINT_HASH_TYPE, PYLINT_HASH_VALUE],
"digest": [PYLINT_HASH_TYPE, PYLINT_SHA256],
"import_tests": "",
"summary": "",
}
Expand Down Expand Up @@ -94,36 +92,49 @@ def pylint_pkginfo():
"extras_require": {':sys_platform=="win32"': ["colorama"]},
"home": "https://github.com/PyCQA/pylint",
"install_requires": [
"astroid>=2.2.0,<3",
"isort>=4.2.5,<5",
"mccabe>=0.6,<0.7",
"astroid >=2.5.2,<2.7",
"isort >=4.2.5,<6",
"mccabe >=0.6,<0.7",
"toml >=0.7.1",
],
"license": "GPL",
"name": "pylint",
"packages": [
"pylint",
"pylint.checkers",
"pylint.pyreverse",
"pylint.checkers.refactoring",
"pylint.config",
"pylint.extensions",
"pylint.lint",
"pylint.message",
"pylint.pyreverse",
"pylint.reporters",
"pylint.reporters.ureports",
"pylint.testutils",
"pylint.utils",
],
"setuptools": True,
"summary": "python code static checker",
"tests_require": ["pytest"],
"tests_require": ["pytest", "pytest-benchmark"],
"version": "2.3.1",
}


@pytest.fixture
def pylint_metadata():
return {
"run_depends": ["astroid >=2.2.0,<3", "isort >=4.2.5,<5", "mccabe >=0.6,<0.7"],
"run_depends": [
"astroid >=2.5.2,<2.7",
"isort >=4.2.5,<6",
"mccabe >=0.6,<0.7",
"toml >=0.7.1",
],
"build_depends": [
"pip",
"astroid >=2.2.0,<3",
"isort >=4.2.5,<5",
"astroid >=2.5.2,<2.7",
"isort >=4.2.5,<6",
"mccabe >=0.6,<0.7",
"toml >=0.7.1",
],
"entry_points": [
"pylint = pylint:run_pylint",
Expand All @@ -137,18 +148,24 @@ def pylint_metadata():
"pyreverse --help",
"symilar --help",
],
"tests_require": ["pytest"],
"tests_require": ["pytest", "pytest-benchmark"],
"version": PYLINT_VERSION,
"pypiurl": PYLINT_URL,
"filename": PYLINT_FILENAME,
"digest": [PYLINT_HASH_TYPE, PYLINT_HASH_VALUE],
"digest": [PYLINT_HASH_TYPE, PYLINT_SHA256],
"import_tests": [
"pylint",
"pylint.checkers",
"pylint.checkers.refactoring",
"pylint.config",
"pylint.extensions",
"pylint.lint",
"pylint.message",
"pylint.pyreverse",
"pylint.reporters",
"pylint.reporters.ureports",
"pylint.testutils",
"pylint.utils",
],
"summary": "python code static checker",
"packagename": "pylint",
Expand Down Expand Up @@ -297,7 +314,7 @@ def test_get_package_metadata(testing_config, mock_metadata, pylint_metadata):
mock_metadata,
{},
".",
"3.7",
"3.9",
False,
False,
[PYLINT_URL],
Expand Down

0 comments on commit 57c5b8e

Please sign in to comment.