Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[python3] Update to Python 3.10.2. #23156

Merged
merged 9 commits into from
Mar 11, 2022
Merged

Conversation

Hoikas
Copy link
Contributor

@Hoikas Hoikas commented Feb 17, 2022

Updates to Python 3.10.2

  • What does your PR fix?

    See above

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    No change

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    WIP

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 805811e16a84a845e1f1c19b8a64b1612d4a7706 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 647960e..e59466a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5537,8 +5537,8 @@
       "port-version": 2
     },
     "python3": {
-      "baseline": "3.10.1",
-      "port-version": 6
+      "baseline": "3.10.2",
+      "port-version": 0
     },
     "qca": {
       "baseline": "2.3.4",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index f8ed50d..28a450d 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0985d2e4642414e9a3a3ab26db4457f0f8fca676",
+      "version-semver": "3.10.2",
+      "port-version": 0
+    },
     {
       "git-tree": "a7ef4a1d73a9e486cd23edd98f12a2f4d4216920",
       "version-semver": "3.10.1",

@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 18, 2022

@JonLiu1993 JonLiu1993 self-assigned this Feb 18, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Feb 18, 2022
@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 18, 2022

Potentially related to this PR:

openxr-loader:x86-windows
Traceback (most recent call last):
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\hpp_genxr.py", line 220, in 
    genTarget(args)
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\hpp_genxr.py", line 116, in genTarget
    gen = CppGenerator(errFile=errWarn,
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\cpp_generator.py", line 427, in __init__
    self.env = make_jinja_environment(file_with_templates_as_sibs=__file__, trim_blocks=False)
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\jinja_helpers.py", line 140, in make_jinja_environment
    from jinja2 import Environment, FileSystemLoader
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\__init__.py", line 33, in 
    from jinja2.environment import Environment, Template
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\environment.py", line 15, in 
    from jinja2 import nodes
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\nodes.py", line 19, in 
    from jinja2.utils import Markup
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\utils.py", line 642, in 
    from markupsafe import Markup, escape, soft_unicode
ImportError: cannot import name 'soft_unicode' from 'markupsafe' (D:\downloads\tools\python\python-3.10.2-x86\lib\site-packages\markupsafe\__init__.py)


Failures unrelated to this PR:

llfio:arm64-windows
CMake Error at D:/installed/arm64-windows/share/ned14-internal-quickcpplib/cmakelib/QuickCppLibUtils.cmake:84 (message):
  FATAL:  is not available, and neither libstdc++ nor libc++ STLs
  will link a program
Call Stack (most recent call first):
  CMakeLists.txt:265 (indented_message)
jsonnet:x64-linux
Testing with Jsonnet executable: 
CMake Error at core/CMakeLists.txt:61 (add_dependencies):
  The dependency target "stdlib" of target "libjsonnet_static" does not exist.

CMake Error at cpp/CMakeLists.txt:32 (add_dependencies):
The dependency target "jsonnet" of target "libjsonnet++_static" does not exist.

ois:x64-linux
CMake Error at CMakeLists.txt:191 (add_dependencies):
  The dependency target "X11" of target "OIS" does not exist.
orc:x64-linux
/mnt/vcpkg-ci/buildtrees/orc/x64-linux-dbg/c++/src/orc_proto.pb.h:10:10: fatal error: google/protobuf/port_def.inc: No such file or directory
   10 | #include 
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 18, 2022

@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 20, 2022

libao failures seem unrelated to this PR:

.././../src/1.2.2-d87489a217.clean/src/audio_out.c(291): error C2065: 'DIR': undeclared identifier
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(291): error C2065: 'plugindir': undeclared identifier
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(291): warning C4552: '*': result of expression not used
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(297): error C2065: 'plugindir': undeclared identifier
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(297): warning C4013: 'opendir' undefined; assuming extern returning int
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(299): error C2065: 'plugindir': undeclared identifier
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(299): warning C4047: '!=': 'int' differs in levels of indirection from 'void *'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(300): warning C4013: 'readdir' undefined; assuming extern returning int
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(300): error C2065: 'plugindir': undeclared identifier
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(300): warning C4047: '=': 'dirent *' differs in levels of indirection from 'int'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(301): error C2037: left of 'd_name' specifies undefined struct/union 'dirent'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(301): error C2198: 'strlen': too few arguments for call
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(301): error C2057: expected constant expression
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(301): error C2466: cannot allocate an array of constant size 0
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(301): error C2133: 'fullpath': unknown size
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(302): warning C4034: sizeof returns 0
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(303): error C2037: left of 'd_name' specifies undefined struct/union 'dirent'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(302): warning C4473: 'snprintf' : not enough arguments passed for format string
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(302): note: placeholders and their parameters expect 2 variadic arguments, but 1 were provided
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(302): note: the missing variadic argument 2 is required by format string '%s'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(305): warning C4013: 'S_ISREG' undefined; assuming extern returning int
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(306): error C2037: left of 'd_name' specifies undefined struct/union 'dirent'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(306): warning C4047: 'function': 'const char *' differs in levels of indirection from 'int'
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(306): warning C4024: 'strrchr': different types for formal and actual parameter 1
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(306): error C2198: 'strrchr': too few arguments for call
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(318): warning C4013: 'closedir' undefined; assuming extern returning int
.././../src/1.2.2-d87489a217.clean/src/audio_out.c(318): error C2065: 'plugindir': undeclared identifier

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index fb3e750..987845c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5114,7 +5114,7 @@
     },
     "openxr-loader": {
       "baseline": "1.0.22",
-      "port-version": 0
+      "port-version": 1
     },
     "optimus-cpp": {
       "baseline": "0.3.0",
diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json
index 9e98d6f..7ccb3bc 100644
--- a/versions/o-/openxr-loader.json
+++ b/versions/o-/openxr-loader.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967",
+      "version": "1.0.22",
+      "port-version": 1
+    },
     {
       "git-tree": "445bbc9debe9866fad35544bd948d54fda4e72c4",
       "version": "1.0.22",

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/openxr-loader/vcpkg.json

Valid values for the license field can be found in the documentation

@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 20, 2022

@github-actions go away

@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 20, 2022

@Hoikas Hoikas marked this pull request as ready for review February 23, 2022 21:11
@Hoikas
Copy link
Contributor Author

Hoikas commented Feb 23, 2022

We're finally ready for review

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 24, 2022
@vicroms
Copy link
Member

vicroms commented Mar 7, 2022

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vicroms vicroms merged commit 89ed56e into microsoft:master Mar 11, 2022
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Mar 14, 2022
* master: (64 commits)
  [baseline] [python3] fix bz2(d) search on linux (microsoft#23525)
  [HPX] Don't remove HPXCacheVariables.cmake during install (microsoft#23042)
  [earcut.hpp] New port (microsoft#23507)
  [libssh2] Fix deleted configfiles (microsoft#23509)
  [python3] Update to Python 3.10.2. (microsoft#23156)
  [qt5-webengine] Fix apply patch failed (microsoft#23484)
  [llvm] Fix LLVM install for 'utils' feature (microsoft#23399)
  [sciter-js] Updated sciter-js to 4.4.8.31 (microsoft#23357)
  [GTL] Add new port (microsoft#23400)
  [raylib] Fix cannot find -lglfw on Linux (microsoft#23348)
  [yato] fix arm build by updating (microsoft#23406)
  [ois] fix pkgconfig file not installed on windows (microsoft#23426)
  Fix the dependency of installing arrow with the parquet feature (microsoft#23423)
  [libjpeg-turbo] Fix usage when building static (microsoft#23427)
  [sentencepiece] Clarify supported triplets (microsoft#23438)
  [zpp-bits] Add new port (microsoft#23458)
  [lionkor-commandline] Add new port (microsoft#23471)
  [libde265] fix static linkage (microsoft#23479)
  [libheif] fix license (microsoft#23480)
  [proj4] Retain former features (fixes `vcpkg upgrade`) (microsoft#23487)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants